From 1aba986d9f219a872c83b5f8b46f641e2699a222 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Sat, 9 Feb 2013 12:42:18 +0000
Subject: [PATCH 001/304] Fixed bug causing nested file read over webdav to
fail
---
apps/files_encryption/lib/proxy.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 55cddf2bec..7ae36e34ce 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -281,7 +281,7 @@ class Proxy extends \OC_FileProxy {
// Reformat path for use with OC_FSV
$path_split = explode( '/', $path );
- $path_f = implode( array_slice( $path_split, 3 ) );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
--
GitLab
From b3e59ca1e31f162d7ac720d8729958f438b23a02 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Sat, 9 Feb 2013 18:39:32 +0000
Subject: [PATCH 002/304] Work on post_share hook for files_encryption New
method in OCP\Share{}:: getUsersSharingFile() Development shapshot
---
apps/files_encryption/hooks/hooks.php | 71 ++-
apps/files_encryption/lib/keymanager.php | 585 +++++++++++------------
apps/files_encryption/lib/proxy.php | 32 +-
lib/public/share.php | 54 +++
4 files changed, 430 insertions(+), 312 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 8bdeee0937..c6d4c16115 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -166,14 +166,77 @@ class Hooks {
*/
public static function postShared( $params ) {
- // Delete existing catfile
- Keymanager::deleteFileKey( );
+ // NOTE: $params is an array with these keys:
+ // itemSource -> int, filecache file ID
+ // shareWith -> string, uid of user being shared to
+ // fileTarget -> path of file being shared
+ // uidOwner -> owner of the original file being shared
- // Generate new catfile and env keys
- Crypt::multiKeyEncrypt( $plainContent, $publicKeys );
+ $view = new \OC_FilesystemView( '/' );
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+
+ $shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'] );
+
+ $userIds = array();
+
+ foreach ( $shares as $share ) {
+
+ $util = new Util( $view, $share['userId'] );
+
+ // Check that the user is encryption capable
+ if ( $util->ready() ) {
+
+ // Construct array of just UIDs for Keymanager{}
+ $userIds[] = $share['userId'];
+
+ } else {
+
+ // Log warning; we can't do necessary setup here
+ // because we don't have the user passphrase
+ // TODO: Provide user feedback indicating that
+ // sharing failed
+ \OC_Log::write( 'Encryption library', 'File cannot be shared: user "'.$share['userId'].'" is not setup for encryption', \OC_Log::WARN );
+
+ }
+
+ }
+
+ trigger_error("UIDS = ".var_export($userIds, 1));
+
+ $userPubKeys = Keymanager::getPublicKeys( $view, $userIds );
+
+// trigger_error("PUB KEYS = ".var_export($userPubKeys, 1));
+
+ // TODO: Fetch path from Crypt{} getter
+ $plainContent = $view->file_get_contents( $userId . '/' . 'files'. '/' . $params['fileTarget'] );
+
+ // Generate new catfile and share keys
+ if ( ! $encrypted = Crypt::multiKeyEncrypt( $plainContent, $userPubKeys ) ) {
+
+ // If the re-encryption failed, don't risk deleting data
+ return false;
+
+ }
+
+ trigger_error("ENCRYPTED = ". var_export($encrypted, 1));
// Save env keys to user folders
+ foreach ( $encrypted['keys'] as $key ) {
+
+// Keymanager::setShareKey( $view, $params['fileTarget'], $userId, $key );
+
+ }
+ // Delete existing catfile
+ // Check if keyfile exists (it won't if file has been shared before)
+ // Do this last to ensure file is recoverable in case of error
+ if ( $util->isEncryptedPath( $params['fileTarget'] ) ) {
+
+ // NOTE: This will trigger an error if keyfile isn't found
+// Keymanager::deleteFileKey( $params['fileTarget'] );
+
+ }
}
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 0d0380db6e..3160572ba1 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -1,267 +1,244 @@
-<?php
-
-/**
- * ownCloud
- *
- * @author Bjoern Schiessle
- * @copyright 2012 Bjoern Schiessle <schiessle@owncloud.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Encryption;
-
-/**
- * @brief Class to manage storage and retrieval of encryption keys
- * @note Where a method requires a view object, it's root must be '/'
- */
-class Keymanager {
-
- /**
- * @brief retrieve the ENCRYPTED private key from a user
- *
- * @return string private key or false
- * @note the key returned by this method must be decrypted before use
- */
- public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
-
- $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-
- $key = $view->file_get_contents( $path );
-
- return $key;
- }
-
- /**
- * @brief retrieve public key for a specified user
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage storage and retrieval of encryption keys
+ * @note Where a method requires a view object, it's root must be '/'
+ */
+class Keymanager {
+
+ /**
+ * @brief retrieve the ENCRYPTED private key from a user
+ *
+ * @return string private key or false
+ * @note the key returned by this method must be decrypted before use
+ */
+ public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
+
+ $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
+
+ $key = $view->file_get_contents( $path );
+
+ return $key;
+ }
+
+ /**
+ * @brief retrieve public key for a specified user
* @param \OC_FilesystemView $view
* @param $userId
- * @return string public key or false
- */
- public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
-
- return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
-
- }
-
- /**
- * @brief retrieve both keys from a user (private and public)
+ * @return string public key or false
+ */
+ public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+
+ return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+
+ }
+
+ /**
+ * @brief Retrieve a user's public and private key
* @param \OC_FilesystemView $view
* @param $userId
- * @return array keys: privateKey, publicKey
- */
- public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
-
- return array(
- 'publicKey' => self::getPublicKey( $view, $userId )
- , 'privateKey' => self::getPrivateKey( $view, $userId )
- );
-
- }
-
- /**
- * @brief Retrieve public keys of all users with access to a file
- * @param string $path Path to file
- * @return array of public keys for the given file
- * @note Checks that the sharing app is enabled should be performed
- * by client code, that isn't checked here
- */
- public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $path = ltrim( $path, '/' );
-
- $filepath = '/' . $userId . '/files/' . $filePath;
-
- // Check if sharing is enabled
- if ( OC_App::isEnabled( 'files_sharing' ) ) {
-
-
-
- } else {
-
- // check if it is a file owned by the user and not shared at all
- $userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
-
- if ( $userview->file_exists( $path ) ) {
-
- $users[] = $userId;
-
- }
-
- }
-
- $view = new \OC_FilesystemView( '/public-keys/' );
-
- $keylist = array();
-
- $count = 0;
-
- foreach ( $users as $user ) {
-
- $keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
-
- }
-
- return $keylist;
-
- }
-
- /**
- * @brief store file encryption key
- *
- * @param string $path relative path of the file, including filename
- * @param string $key
- * @return bool true/false
- * @note The keyfile is not encrypted here. Client code must
- * asymmetrically encrypt the keyfile before passing it to this method
- */
- public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
-
- $basePath = '/' . $userId . '/files_encryption/keyfiles';
-
- $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-
-
-
- } else {
-
- // Save the keyfile in parallel directory
- return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
- }
-
- }
-
- /**
- * @brief retrieve keyfile for an encrypted file
+ * @return array keys: privateKey, publicKey
+ */
+ public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
+
+ return array(
+ 'publicKey' => self::getPublicKey( $view, $userId )
+ , 'privateKey' => self::getPrivateKey( $view, $userId )
+ );
+
+ }
+
+ /**
+ * @brief Retrieve public keys for given users
+ * @param \OC_FilesystemView $view
+ * @param array $userIds
+ * @return array of public keys for the specified users
+ */
+ public static function getPublicKeys( \OC_FilesystemView $view, $userIds ) {
+
+ $i = 0;
+ $keys = array();
+
+ foreach ( $userIds as $userId ) {
+
+ $i++;
+ $keys[$userId] = self::getPublicKey( $view, $userId );
+
+ }
+
+ $keys['total'] = $i;
+
+ return $keys;
+
+ }
+
+ /**
+ * @brief store file encryption key
+ *
+ * @param string $path relative path of the file, including filename
+ * @param string $key
+ * @return bool true/false
+ * @note The keyfile is not encrypted here. Client code must
+ * asymmetrically encrypt the keyfile before passing it to this method
+ */
+ public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+
+ $basePath = '/' . $userId . '/files_encryption/keyfiles';
+
+ $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+
+ if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
+
+
+
+ } else {
+
+ // Save the keyfile in parallel directory
+ return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+
+ }
+
+ }
+
+ /**
+ * @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
* @param $userId
* @param $filePath
* @internal param \OCA\Encryption\file $string name
* @return string file key or false
- * @note The keyfile returned is asymmetrically encrypted. Decryption
- * of the keyfile must be performed by client code
- */
- public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $filePath_f = ltrim( $filePath, '/' );
-
- $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
-
- if ( $view->file_exists( $catfilePath ) ) {
-
- return $view->file_get_contents( $catfilePath );
-
- } else {
-
- return false;
-
- }
-
- }
-
- /**
- * @brief Delete a keyfile
- *
+ * @note The keyfile returned is asymmetrically encrypted. Decryption
+ * of the keyfile must be performed by client code
+ */
+ public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ $filePath_f = ltrim( $filePath, '/' );
+
+ $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+
+ if ( $view->file_exists( $catfilePath ) ) {
+
+ return $view->file_get_contents( $catfilePath );
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Delete a keyfile
+ *
* @param OC_FilesystemView $view
* @param string $userId username
* @param string $path path of the file the key belongs to
* @return bool Outcome of unlink operation
* @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
* /data/admin/files/mydoc.txt
- */
- public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
-
- // Unlink doesn't tell us if file was deleted (not found returns
- // true), so we perform our own test
- if ( $view->file_exists( $keyPath ) ) {
-
- return $view->unlink( $keyPath );
-
- } else {
-
- \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
-
- return false;
-
- }
-
- }
-
- /**
- * @brief store private key from the user
- * @param string key
- * @return bool
- * @note Encryption of the private key must be performed by client code
- * as no encryption takes place here
- */
- public static function setPrivateKey( $key ) {
-
- $user = \OCP\User::getUser();
-
- $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
-
- \OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
-
- return $view->file_put_contents( $user . '.private.key', $key );
-
- \OC_FileProxy::$enabled = true;
-
- }
-
- /**
- * @brief store private keys from the user
- *
- * @param string privatekey
- * @param string publickey
- * @return bool true/false
- */
- public static function setUserKeys($privatekey, $publickey) {
-
- return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
-
- }
-
- /**
- * @brief store public key of the user
- *
- * @param string key
- * @return bool true/false
- */
- public static function setPublicKey( $key ) {
-
- $view = new \OC_FilesystemView( '/public-keys' );
-
- \OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
-
- return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
-
- \OC_FileProxy::$enabled = true;
-
- }
-
- /**
+ */
+ public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
+
+ $trimmed = ltrim( $path, '/' );
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
+
+ // Unlink doesn't tell us if file was deleted (not found returns
+ // true), so we perform our own test
+ if ( $view->file_exists( $keyPath ) ) {
+
+ return $view->unlink( $keyPath );
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief store private key from the user
+ * @param string key
+ * @return bool
+ * @note Encryption of the private key must be performed by client code
+ * as no encryption takes place here
+ */
+ public static function setPrivateKey( $key ) {
+
+ $user = \OCP\User::getUser();
+
+ $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+
+ \OC_FileProxy::$enabled = false;
+
+ if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
+
+ return $view->file_put_contents( $user . '.private.key', $key );
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
+ /**
+ * @brief store private keys from the user
+ *
+ * @param string privatekey
+ * @param string publickey
+ * @return bool true/false
+ */
+ public static function setUserKeys($privatekey, $publickey) {
+
+ return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
+
+ }
+
+ /**
+ * @brief store public key of the user
+ *
+ * @param string key
+ * @return bool true/false
+ */
+ public static function setPublicKey( $key ) {
+
+ $view = new \OC_FilesystemView( '/public-keys' );
+
+ \OC_FileProxy::$enabled = false;
+
+ if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
+
+ return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
+ /**
* @brief store file encryption key
*
* @param string $path relative path of the file, including filename
@@ -271,70 +248,70 @@ class Keymanager {
* @return bool true/false
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
- */
- public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
-
- $basePath = '/' . $userId . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
-
+ */
+ public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
+
+ $basePath = '/' . $userId . '/files_encryption/share-keys';
+
+ $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+
+ return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
+
}
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
-
- $targetPath = ltrim( $path, '/' );
-
- $path_parts = pathinfo( $targetPath );
-
- // If the file resides within a subdirectory, create it
+
+ $targetPath = ltrim( $path, '/' );
+
+ $path_parts = pathinfo( $targetPath );
+
+ // If the file resides within a subdirectory, create it
if (
isset( $path_parts['dirname'] )
&& ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
- ) {
-
- $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
-
- }
-
+ ) {
+
+ $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
+
+ }
+
return $targetPath;
- }
-
- /**
- * @brief change password of private encryption key
- *
- * @param string $oldpasswd old password
- * @param string $newpasswd new password
- * @return bool true/false
- */
- public static function changePasswd($oldpasswd, $newpasswd) {
-
- if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
- return Crypt::changekeypasscode($oldpasswd, $newpasswd);
- }
- return false;
-
- }
-
- /**
- * @brief Fetch the legacy encryption key from user files
- * @param string $login used to locate the legacy key
- * @param string $passphrase used to decrypt the legacy key
- * @return true / false
- *
- * if the key is left out, the default handeler will be used
- */
- public function getLegacyKey() {
-
- $user = \OCP\User::getUser();
- $view = new \OC_FilesystemView( '/' . $user );
- return $view->file_get_contents( 'encryption.key' );
-
- }
-
+ }
+
+ /**
+ * @brief change password of private encryption key
+ *
+ * @param string $oldpasswd old password
+ * @param string $newpasswd new password
+ * @return bool true/false
+ */
+ public static function changePasswd($oldpasswd, $newpasswd) {
+
+ if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
+ return Crypt::changekeypasscode($oldpasswd, $newpasswd);
+ }
+ return false;
+
+ }
+
+ /**
+ * @brief Fetch the legacy encryption key from user files
+ * @param string $login used to locate the legacy key
+ * @param string $passphrase used to decrypt the legacy key
+ * @return true / false
+ *
+ * if the key is left out, the default handeler will be used
+ */
+ public function getLegacyKey() {
+
+ $user = \OCP\User::getUser();
+ $view = new \OC_FilesystemView( '/' . $user );
+ return $view->file_get_contents( 'encryption.key' );
+
+ }
+
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7ae36e34ce..58b9bc0725 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -95,7 +95,8 @@ class Proxy extends \OC_FileProxy {
if ( self::shouldEncrypt( $path ) ) {
- if ( !is_resource( $data ) ) { //stream put contents should have been converted to fopen
+ // Stream put contents should have been converted to fopen
+ if ( !is_resource( $data ) ) {
$userId = \OCP\USER::getUser();
@@ -107,10 +108,33 @@ class Proxy extends \OC_FileProxy {
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
- // TODO: Check if file is shared, if so, use multiKeyEncrypt
+ $fileOwner = \OC\Files\Filesystem::getOwner( $path );
- // Encrypt plain data and fetch key
- $encrypted = Crypt::keyEncryptKeyfile( $data, Keymanager::getPublicKey( $rootView, $userId ) );
+ // Check if the keyfile needs to be shared
+ if (
+ $fileOwner !== true
+ or $fileOwner !== $userId
+ ) {
+
+ // Shared storage backend isn't loaded
+
+ $users = \OCP\Share::getItemShared( 'file', $path, \OC_Share_backend_File::FORMAT_SHARED_STORAGE );
+//
+ trigger_error("SHARE USERS = ". var_export($users, 1));
+//
+// $publicKeys = Keymanager::getPublicKeys( $rootView, $users);
+//
+// // Encrypt plain data to multiple users
+// $encrypted = Crypt::multiKeyEncrypt( $data, $publicKeys );
+
+ } else {
+
+ $publicKey = Keymanager::getPublicKey( $rootView, $userId );
+
+ // Encrypt plain data to a single user
+ $encrypted = Crypt::keyEncryptKeyfile( $data, $publicKey );
+
+ }
// Replace plain content with encrypted content by reference
$data = $encrypted['data'];
diff --git a/lib/public/share.php b/lib/public/share.php
index af2a538e25..936f85021c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -91,6 +91,60 @@ class Share {
}
return false;
}
+
+ /**
+ * @brief Find which users can access a shared item
+ * @param string Item type
+ * @param int Format (optional) Format type must be defined by the backend
+ * @param int Number of items to return (optional) Returns all by default
+ * @return Return depends on format
+ */
+ public static function getUsersSharingFile( $path ) {
+
+ // Fetch all shares of this file path from DB
+ $query = \OC_DB::prepare(
+ 'SELECT
+ share_type
+ , share_with
+ , permissions
+ FROM
+ `*PREFIX*share`
+ WHERE
+ file_target = ?'
+ );
+
+ $result = $query->execute( array( $path ) );
+
+ if ( \OC_DB::isError( $result ) ) {
+
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result) . ', path=' . $path, \OC_Log::ERROR );
+
+ }
+
+ $shares = array();
+
+ while( $row = $result->fetchRow() ) {
+
+ // Set helpful array keys
+ $shares[] = array(
+ 'userId' => $row['share_with']
+ , 'shareType' => $row['share_type']
+ , 'permissions' => $row['permissions']
+ );
+
+ }
+
+ if ( ! empty( $shares ) ) {
+
+ return $shares;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
/**
* @brief Get the items of item type shared with the current user
--
GitLab
From 9c1196d73e0dc57f1f20a57e459ce053264172b8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 10 Feb 2013 12:05:41 +0100
Subject: [PATCH 003/304] Cache: add seccond mtime field
---
db_structure.xml | 8 ++++++++
lib/util.php | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/db_structure.xml b/db_structure.xml
index fc7f1082ff..a86e5e6a8f 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -261,6 +261,14 @@
<length>4</length>
</field>
+ <field>
+ <name>storage_mtime</name>
+ <type>integer</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
<field>
<name>encrypted</name>
<type>integer</type>
diff --git a/lib/util.php b/lib/util.php
index a5fe4cb175..7950586b58 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -74,7 +74,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, 91, 9);
+ return array(4, 91, 10);
}
/**
--
GitLab
From 3e70d563a6774567ec77e9d9adf6b9ccb1e9619d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 10 Feb 2013 12:27:35 +0100
Subject: [PATCH 004/304] Cache: bookkeeping of storage_mtime
---
lib/files/cache/cache.php | 17 ++++++++++++++---
lib/files/cache/scanner.php | 1 +
lib/files/cache/watcher.php | 2 +-
tests/lib/files/cache/cache.php | 18 ++++++++++++++++++
tests/lib/files/cache/watcher.php | 10 +++++-----
tests/lib/files/view.php | 2 +-
6 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index dcb6e8fd39..d696f003c5 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -114,7 +114,7 @@ class Cache {
$params = array($file);
}
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
FROM `*PREFIX*filecache` ' . $where);
$result = $query->execute($params);
$data = $result->fetchRow();
@@ -133,6 +133,9 @@ class Cache {
$data['storage'] = $this->storageId;
$data['mimetype'] = $this->getMimetype($data['mimetype']);
$data['mimepart'] = $this->getMimetype($data['mimepart']);
+ if ($data['storage_mtime'] == 0) {
+ $data['storage_mtime'] = $data['mtime'];
+ }
}
return $data;
@@ -148,13 +151,16 @@ class Cache {
$fileId = $this->getId($folder);
if ($fileId > -1) {
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
$result = $query->execute(array($fileId));
$files = $result->fetchAll();
foreach ($files as &$file) {
$file['mimetype'] = $this->getMimetype($file['mimetype']);
$file['mimepart'] = $this->getMimetype($file['mimepart']);
+ if ($file['storage_mtime'] == 0) {
+ $file['storage_mtime'] = $file['mtime'];
+ }
}
return $files;
} else {
@@ -226,7 +232,7 @@ class Cache {
* @return array
*/
function buildParts(array $data) {
- $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'etag');
+ $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'etag');
$params = array();
$queryParts = array();
foreach ($data as $name => $value) {
@@ -238,6 +244,11 @@ class Cache {
$params[] = $this->getMimetypeId(substr($value, 0, strpos($value, '/')));
$queryParts[] = '`mimepart`';
$value = $this->getMimetypeId($value);
+ } elseif ($name === 'storage_mtime') {
+ if (!isset($data['mtime'])) {
+ $params[] = $value;
+ $queryParts[] = '`mtime`';
+ }
}
$params[] = $value;
$queryParts[] = '`' . $name . '`';
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 9a5546dce3..2623a167e9 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -51,6 +51,7 @@ class Scanner {
$data['size'] = $this->storage->filesize($path);
}
$data['etag'] = $this->storage->getETag($path);
+ $data['storage_mtime'] = $data['mtime'];
return $data;
}
diff --git a/lib/files/cache/watcher.php b/lib/files/cache/watcher.php
index 31059ec7f5..8bfd4602f3 100644
--- a/lib/files/cache/watcher.php
+++ b/lib/files/cache/watcher.php
@@ -43,7 +43,7 @@ class Watcher {
*/
public function checkUpdate($path) {
$cachedEntry = $this->cache->get($path);
- if ($this->storage->hasUpdated($path, $cachedEntry['mtime'])) {
+ if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) {
if ($this->storage->is_dir($path)) {
$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
} else {
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index c466fbb63e..794664c889 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -204,6 +204,23 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->assertEquals(array($storageId, 'foo'), \OC\Files\Cache\Cache::getById($id));
}
+ function testStorageMTime() {
+ $data = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file');
+ $this->cache->put('foo', $data);
+ $cachedData = $this->cache->get('foo');
+ $this->assertEquals($data['mtime'], $cachedData['storage_mtime']);//if no storage_mtime is saved, mtime should be used
+
+ $this->cache->put('foo', array('storage_mtime' => 30));//when setting storage_mtime, mtime is also set
+ $cachedData = $this->cache->get('foo');
+ $this->assertEquals(30, $cachedData['storage_mtime']);
+ $this->assertEquals(30, $cachedData['mtime']);
+
+ $this->cache->put('foo', array('mtime' => 25));//setting mtime does not change storage_mtime
+ $cachedData = $this->cache->get('foo');
+ $this->assertEquals(30, $cachedData['storage_mtime']);
+ $this->assertEquals(25, $cachedData['mtime']);
+ }
+
public function tearDown() {
$this->cache->clear();
}
@@ -213,3 +230,4 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->cache = new \OC\Files\Cache\Cache($this->storage);
}
}
+
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index e8a1689cab..1ea0c2eb47 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -35,7 +35,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$updater = $storage->getWatcher();
//set the mtime to the past so it can detect an mtime change
- $cache->put('', array('mtime' => 10));
+ $cache->put('', array('storage_mtime' => 10));
$this->assertTrue($cache->inCache('folder/bar.txt'));
$this->assertTrue($cache->inCache('folder/bar2.txt'));
@@ -47,14 +47,14 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$cachedData = $cache->get('bar.test');
$this->assertEquals(3, $cachedData['size']);
- $cache->put('bar.test', array('mtime' => 10));
+ $cache->put('bar.test', array('storage_mtime' => 10));
$storage->file_put_contents('bar.test', 'test data');
$updater->checkUpdate('bar.test');
$cachedData = $cache->get('bar.test');
$this->assertEquals(9, $cachedData['size']);
- $cache->put('folder', array('mtime' => 10));
+ $cache->put('folder', array('storage_mtime' => 10));
$storage->unlink('folder/bar2.txt');
$updater->checkUpdate('folder');
@@ -69,7 +69,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$updater = $storage->getWatcher();
//set the mtime to the past so it can detect an mtime change
- $cache->put('', array('mtime' => 10));
+ $cache->put('', array('storage_mtime' => 10));
$storage->unlink('foo.txt');
$storage->rename('folder', 'foo.txt');
@@ -86,7 +86,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
$updater = $storage->getWatcher();
//set the mtime to the past so it can detect an mtime change
- $cache->put('foo.txt', array('mtime' => 10));
+ $cache->put('foo.txt', array('storage_mtime' => 10));
$storage->unlink('foo.txt');
$storage->rename('folder', 'foo.txt');
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index a064e44f3e..c9a8a0fb08 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -220,7 +220,7 @@ class View extends \PHPUnit_Framework_TestCase {
$cachedData = $rootView->getFileInfo('foo.txt');
$this->assertEquals(16, $cachedData['size']);
- $rootView->putFileInfo('foo.txt', array('mtime' => 10));
+ $rootView->putFileInfo('foo.txt', array('storage_mtime' => 10));
$storage1->file_put_contents('foo.txt', 'foo');
clearstatcache();
--
GitLab
From 9738fae3cf1ad18593d21eb62e138e00c01f5f36 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 10 Feb 2013 12:44:27 +0100
Subject: [PATCH 005/304] Emulate touch() for backends that don't support it
---
lib/files/view.php | 16 ++++++++++------
tests/lib/files/view.php | 34 ++++++++++++++++++++++++++++++++--
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/lib/files/view.php b/lib/files/view.php
index 1a234228ea..69e2f1ad34 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -242,7 +242,11 @@ class View {
if (!is_null($mtime) and !is_numeric($mtime)) {
$mtime = strtotime($mtime);
}
- return $this->basicOperation('touch', $path, array('write'), $mtime);
+ $result = $this->basicOperation('touch', $path, array('write'), $mtime);
+ if (!$result) { //if native touch fails, we emulate it by changing the mtime in the cache
+ $this->putFileInfo($path, array('mtime' => $mtime));
+ }
+ return true;
}
public function file_get_contents($path) {
@@ -917,11 +921,11 @@ class View {
}
/**
- * 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 function getOwner($path) {
return $this->basicOperation('getOwner', $path);
}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index c9a8a0fb08..af97761bbb 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -7,6 +7,12 @@
namespace Test\Files;
+class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
+ public function touch($path, $mtime = null) {
+ return false;
+ }
+}
+
class View extends \PHPUnit_Framework_TestCase {
/**
* @var \OC\Files\Storage\Storage[] $storages;
@@ -228,12 +234,36 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals(3, $cachedData['size']);
}
+ function testTouch() {
+ $storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch');
+
+ \OC\Files\Filesystem::mount($storage, array(), '/');
+
+ $rootView = new \OC\Files\View('');
+ $oldCachedData = $rootView->getFileInfo('foo.txt');
+
+ $rootView->touch('foo.txt', 500);
+
+ $cachedData = $rootView->getFileInfo('foo.txt');
+ $this->assertEquals(500, $cachedData['mtime']);
+ $this->assertEquals($oldCachedData['storage_mtime'], $cachedData['storage_mtime']);
+
+ $rootView->putFileInfo('foo.txt', array('storage_mtime' => 1000)); //make sure the watcher detects the change
+ $rootView->file_put_contents('foo.txt', 'asd');
+ $cachedData = $rootView->getFileInfo('foo.txt');
+ $this->assertGreaterThanOrEqual($cachedData['mtime'], $oldCachedData['mtime']);
+ $this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
+ }
+
/**
* @param bool $scan
* @return \OC\Files\Storage\Storage
*/
- private function getTestStorage($scan = true) {
- $storage = new \OC\Files\Storage\Temporary(array());
+ private function getTestStorage($scan = true, $class = '\OC\Files\Storage\Temporary') {
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ $storage = new $class(array());
$textData = "dummy file data\n";
$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
$storage->mkdir('folder');
--
GitLab
From 92f06243be62945b5ff5e7542e9984f7bb45d74b Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Mon, 11 Feb 2013 10:21:23 +0000
Subject: [PATCH 006/304] Implementing sharing support New file-specific
methods in lib/public/share Changes to how keyfiles are stored
---
apps/files_encryption/hooks/hooks.php | 47 +++++-----
apps/files_encryption/lib/crypt.php | 41 +++++---
apps/files_encryption/lib/keymanager.php | 97 +++++++++++++++++--
apps/files_encryption/lib/proxy.php | 113 +++++++++++++----------
apps/files_encryption/test/crypt.php | 8 +-
lib/public/share.php | 82 ++++++++++++++--
6 files changed, 283 insertions(+), 105 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c6d4c16115..9252a341fb 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -82,8 +82,12 @@ class Hooks {
}
+ \OC_FileProxy::$enabled = false;
+
$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
+ \OC_FileProxy::$enabled = false;
+
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
// app (see appinfo/spec.txt)
@@ -175,8 +179,9 @@ class Hooks {
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
+ $session = new Session();
- $shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'] );
+ $shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'], 1 );
$userIds = array();
@@ -202,41 +207,35 @@ class Hooks {
}
- trigger_error("UIDS = ".var_export($userIds, 1));
-
$userPubKeys = Keymanager::getPublicKeys( $view, $userIds );
-// trigger_error("PUB KEYS = ".var_export($userPubKeys, 1));
-
- // TODO: Fetch path from Crypt{} getter
- $plainContent = $view->file_get_contents( $userId . '/' . 'files'. '/' . $params['fileTarget'] );
+ \OC_FileProxy::$enabled = false;
- // Generate new catfile and share keys
- if ( ! $encrypted = Crypt::multiKeyEncrypt( $plainContent, $userPubKeys ) ) {
+ // get the keyfile
+ $encKeyfile = Keymanager::getFileKey( $view, $userId, $params['fileTarget'] );
- // If the re-encryption failed, don't risk deleting data
- return false;
-
- }
+ $privateKey = $session->getPrivateKey();
- trigger_error("ENCRYPTED = ". var_export($encrypted, 1));
+ // decrypt the keyfile
+ $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
- // Save env keys to user folders
- foreach ( $encrypted['keys'] as $key ) {
+ // re-enc keyfile to sharekeys
+ $shareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
-// Keymanager::setShareKey( $view, $params['fileTarget'], $userId, $key );
+ // save sharekeys
+ if ( ! Keymanager::setShareKeys( $view, $params['fileTarget'], $shareKeys['keys'] ) ) {
+ trigger_error( "SET Share keys failed" );
+
}
- // Delete existing catfile
- // Check if keyfile exists (it won't if file has been shared before)
+ // Delete existing keyfile
// Do this last to ensure file is recoverable in case of error
- if ( $util->isEncryptedPath( $params['fileTarget'] ) ) {
-
- // NOTE: This will trigger an error if keyfile isn't found
-// Keymanager::deleteFileKey( $params['fileTarget'] );
+// Keymanager::deleteFileKey( $view, $userId, $params['fileTarget'] );
- }
+ \OC_FileProxy::$enabled = true;
+
+ return true;
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index e3d23023db..fdee03eeaf 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -370,22 +370,41 @@ class Crypt {
/**
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
+ * @param array $publicKeys array keys must be the userId of corresponding user
+ * @returns array keys: keys (array, key = userId), encrypted
+ * @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
-
+
+ // openssl_seal returns false without errors if $plainContent
+ // is empty, so trigger our own error
+ if ( empty( $plainContent ) ) {
+
+ trigger_error( "Cannot mutliKeyEncrypt empty plain content" );
+ throw new \Exception( 'Cannot mutliKeyEncrypt empty plain content' );
+
+ }
+
// Set empty vars to be set by openssl by reference
$sealed = '';
- $envKeys = array();
+ $shareKeys = array();
- if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
+ if( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {
+
+ $i = 0;
+
+ // Ensure each shareKey is labelled with its
+ // corresponding userId
+ foreach ( $publicKeys as $userId => $publicKey ) {
+
+ $mappedShareKeys[$userId] = $shareKeys[$i];
+ $i++;
+
+ }
return array(
- 'keys' => $envKeys
- , 'encrypted' => $sealed
+ 'keys' => $mappedShareKeys
+ , 'data' => $sealed
);
} else {
@@ -404,7 +423,7 @@ class Crypt {
*
* This function decrypts a file
*/
- public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+ public static function multiKeyDecrypt( $encryptedContent, $shareKey, $privateKey ) {
if ( !$encryptedContent ) {
@@ -412,7 +431,7 @@ class Crypt {
}
- if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+ if ( openssl_open( $encryptedContent, $plainContent, $shareKey, $privateKey ) ) {
return $plainContent;
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 3160572ba1..5f9eea1a0b 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -52,8 +52,11 @@ class Keymanager {
*/
public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+ \OC_FileProxy::$enabled = false;
+
return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+ \OC_FileProxy::$enabled = true;
}
/**
@@ -77,20 +80,16 @@ class Keymanager {
* @param array $userIds
* @return array of public keys for the specified users
*/
- public static function getPublicKeys( \OC_FilesystemView $view, $userIds ) {
+ public static function getPublicKeys( \OC_FilesystemView $view, array $userIds ) {
- $i = 0;
$keys = array();
foreach ( $userIds as $userId ) {
- $i++;
$keys[$userId] = self::getPublicKey( $view, $userId );
}
- $keys['total'] = $i;
-
return $keys;
}
@@ -137,11 +136,11 @@ class Keymanager {
$filePath_f = ltrim( $filePath, '/' );
- $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ $keyfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
- if ( $view->file_exists( $catfilePath ) ) {
+ if ( $view->file_exists( $keyfilePath ) ) {
- return $view->file_get_contents( $catfilePath );
+ return $view->file_get_contents( $keyfilePath );
} else {
@@ -239,7 +238,7 @@ class Keymanager {
}
/**
- * @brief store file encryption key
+ * @brief store share key
*
* @param string $path relative path of the file, including filename
* @param string $key
@@ -255,7 +254,85 @@ class Keymanager {
$shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
- return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
+ $writePath = $basePath . '/' . $shareKeyPath . '.shareKey';
+
+ \OC_FileProxy::$enabled = false;
+
+ $result = $view->file_put_contents( $writePath, $shareKey );
+
+ if (
+ is_int( $result )
+ && $result > 0
+ ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief store multiple share keys for a single file
+ * @return bool
+ */
+ public static function setShareKeys( \OC_FilesystemView $view, $path, array $shareKeys ) {
+
+ // $shareKeys must be an array with the following format:
+ // [userId] => [encrypted key]
+
+ $result = true;
+
+ foreach ( $shareKeys as $userId => $shareKey ) {
+
+ if ( ! self::setShareKey( $view, $path, $userId, $shareKey ) ) {
+
+ // If any of the keys are not set, flag false
+ $result = false;
+
+ }
+
+ }
+
+ // Returns false if any of the keys weren't set
+ return $result;
+
+ }
+
+ /**
+ * @brief retrieve shareKey for an encrypted file
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @param $filePath
+ * @internal param \OCA\Encryption\file $string name
+ * @return string file key or false
+ * @note The sharekey returned is encrypted. Decryption
+ * of the keyfile must be performed by client code
+ */
+ public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ \OC_FileProxy::$enabled = false;
+
+ $filePath_f = ltrim( $filePath, '/' );
+
+ $shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $filePath_f . '.shareKey';
+
+ if ( $view->file_exists( $shareKeyPath ) ) {
+
+ $result = $view->file_get_contents( $shareKeyPath );
+
+ } else {
+
+ $result = false;
+
+ }
+
+ \OC_FileProxy::$enabled = true;
+
+ return $result;
}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 58b9bc0725..b5e59e89b9 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -99,58 +99,65 @@ class Proxy extends \OC_FileProxy {
if ( !is_resource( $data ) ) {
$userId = \OCP\USER::getUser();
-
$rootView = new \OC_FilesystemView( '/' );
-
+ $util = new Util( $rootView, $userId );
+ $filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
$size = strlen( $data );
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
- $fileOwner = \OC\Files\Filesystem::getOwner( $path );
+ // Encrypt data
+ $encData = Crypt::symmetricEncryptFileContentKeyfile( $data );
// Check if the keyfile needs to be shared
- if (
- $fileOwner !== true
- or $fileOwner !== $userId
- ) {
+ if ( \OCP\Share::isSharedFile( $filePath ) ) {
+
+// $fileOwner = \OC\Files\Filesystem::getOwner( $path );
+
+ // List everyone sharing the file
+ $shares = \OCP\Share::getUsersSharingFile( $filePath, 1 );
+
+ $userIds = array();
+
+ foreach ( $shares as $share ) {
+
+ $userIds[] = $share['userId'];
+
+ }
+
+ $publicKeys = Keymanager::getPublicKeys( $rootView, $userIds );
+
+ \OC_FileProxy::$enabled = false;
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt( $encData['key'], $publicKeys );
+
+ // Save sharekeys to user folders
+ Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
+
+ // Set encrypted keyfile as common varname
+ $encKey = $multiEncrypted['encrypted'];
- // Shared storage backend isn't loaded
- $users = \OCP\Share::getItemShared( 'file', $path, \OC_Share_backend_File::FORMAT_SHARED_STORAGE );
-//
- trigger_error("SHARE USERS = ". var_export($users, 1));
-//
-// $publicKeys = Keymanager::getPublicKeys( $rootView, $users);
-//
-// // Encrypt plain data to multiple users
-// $encrypted = Crypt::multiKeyEncrypt( $data, $publicKeys );
} else {
$publicKey = Keymanager::getPublicKey( $rootView, $userId );
// Encrypt plain data to a single user
- $encrypted = Crypt::keyEncryptKeyfile( $data, $publicKey );
+ $encKey = Crypt::keyEncrypt( $encData['key'], $publicKey );
}
- // Replace plain content with encrypted content by reference
- $data = $encrypted['data'];
-
- $filePath = explode( '/', $path );
-
- $filePath = array_slice( $filePath, 3 );
-
- $filePath = '/' . implode( '/', $filePath );
-
- // TODO: make keyfile dir dynamic from app config
-
- $view = new \OC_FilesystemView( '/' );
+ // TODO: Replace userID with ownerId so keyfile is saved centrally
// Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $view, $filePath, $userId, $encrypted['key'] );
+ Keymanager::setFileKey( $rootView, $filePath, $userId, $encKey );
+
+ // Replace plain content with encrypted content by reference
+ $data = $encData['encrypted'];
// Update the file cache with file info
\OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
@@ -168,8 +175,6 @@ class Proxy extends \OC_FileProxy {
* @param string $data Data that has been read from file
*/
public function postFile_get_contents( $path, $data ) {
-
- // TODO: Use dependency injection to add required args for view and user etc. to this method
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
@@ -180,45 +185,55 @@ class Proxy extends \OC_FileProxy {
&& Crypt::isCatfile( $data )
) {
- $split = explode( '/', $path );
-
- $filePath = array_slice( $split, 3 );
+ $view = new \OC_FilesystemView( '/' );
+ $userId = \OCP\USER::getUser();
+ $session = new Session();
+ $util = new Util( $view, $userId );
+ $filePath = $util->stripUserFilesPath( $path );
+ $privateKey = $session->getPrivateKey( $userId );
- $filePath = '/' . implode( '/', $filePath );
+ // Get the encrypted keyfile
+ $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
- //$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
+ // Check if key is shared or not
+ if ( \OCP\Share::isSharedFile( $filePath ) ) {
- $view = new \OC_FilesystemView( '' );
+ // If key is shared, fetch the user's shareKey
+ $shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
+
+ \OC_FileProxy::$enabled = false;
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
- $userId = \OCP\USER::getUser();
+ } else {
+
+ // If key is unshared, decrypt with user private key
+ $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
- // TODO: Check if file is shared, if so, use multiKeyDecrypt
+ }
- $encryptedKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
+ $plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
- $session = new Session();
-
- $decrypted = Crypt::keyDecryptKeyfile( $data, $encryptedKeyfile, $session->getPrivateKey( $split[1] ) );
-
} elseif (
Crypt::mode() == 'server'
&& isset( $_SESSION['legacyenckey'] )
&& Crypt::isEncryptedMeta( $path )
) {
- $decrypted = Crypt::legacyDecrypt( $data, $_SESSION['legacyenckey'] );
+ $plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
}
\OC_FileProxy::$enabled = true;
- if ( ! isset( $decrypted ) ) {
+ if ( ! isset( $plainData ) ) {
- $decrypted = $data;
+ $plainData = $data;
}
- return $decrypted;
+ return $plainData;
}
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
index aa87ec3282..48ad2ee007 100755
--- a/apps/files_encryption/test/crypt.php
+++ b/apps/files_encryption/test/crypt.php
@@ -439,14 +439,14 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
- $crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataUrl, array( $pair1['publicKey'] ) );
+ $crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataShort, array( $pair1['publicKey'] ) );
- $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
+ $this->assertNotEquals( $this->dataShort, $crypted['data'] );
- $decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['encrypted'], $crypted['keys'][0], $pair1['privateKey'] );
+ $decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['data'], $crypted['keys'][0], $pair1['privateKey'] );
- $this->assertEquals( $this->dataUrl, $decrypt );
+ $this->assertEquals( $this->dataShort, $decrypt );
}
diff --git a/lib/public/share.php b/lib/public/share.php
index 936f85021c..4170783d71 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -92,20 +92,73 @@ class Share {
return false;
}
+ /**
+ * @brief Prepare a path to be passed to DB as file_target
+ * @return string Prepared path
+ */
+ public static function prepFileTarget( $path ) {
+
+ // Paths in DB are stored with leading slashes, so add one if necessary
+ if ( substr( $path, 0, 1 ) !== '/' ) {
+
+ $path = '/' . $path;
+
+ }
+
+ return $path;
+
+ }
+
+ public static function isSharedFile( $path ) {
+
+ $fPath = self::prepFileTarget( $path );
+
+ // Fetch all shares of this file path from DB
+ $query = \OC_DB::prepare(
+ 'SELECT
+ id
+ FROM
+ `*PREFIX*share`
+ WHERE
+ file_target = ?'
+ );
+
+ $result = $query->execute( array( $fPath ) );
+
+ if ( \OC_DB::isError( $result ) ) {
+
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage( $result ) . ', path=' . $fPath, \OC_Log::ERROR );
+
+ }
+
+ if ( $result->fetchRow() !== false ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
/**
* @brief Find which users can access a shared item
- * @param string Item type
- * @param int Format (optional) Format type must be defined by the backend
- * @param int Number of items to return (optional) Returns all by default
- * @return Return depends on format
+ * @return bool / array
+ * @note $path needs to be relative to user data dir, e.g. 'file.txt'
+ * not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $path ) {
+ public static function getUsersSharingFile( $path, $includeOwner = 0 ) {
+
+ $fPath = self::prepFileTarget( $path );
// Fetch all shares of this file path from DB
$query = \OC_DB::prepare(
'SELECT
share_type
, share_with
+ , uid_owner
, permissions
FROM
`*PREFIX*share`
@@ -113,11 +166,11 @@ class Share {
file_target = ?'
);
- $result = $query->execute( array( $path ) );
+ $result = $query->execute( array( $fPath ) );
if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result) . ', path=' . $path, \OC_Log::ERROR );
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result) . ', path=' . $fPath, \OC_Log::ERROR );
}
@@ -128,6 +181,7 @@ class Share {
// Set helpful array keys
$shares[] = array(
'userId' => $row['share_with']
+ , 'owner' => $row['uid_owner'] // we just set this so it can be used once, hugly hack :/
, 'shareType' => $row['share_type']
, 'permissions' => $row['permissions']
);
@@ -136,6 +190,20 @@ class Share {
if ( ! empty( $shares ) ) {
+ // Include owner in list of users, if requested
+ if ( $includeOwner == 1 ) {
+
+ // NOTE: The values are incorrect for shareType and
+ // permissions of the owner; we just include them for
+ // optional convenience
+ $shares[] = array(
+ 'userId' => $shares[0]['owner']
+ , 'shareType' => 0
+ , 'permissions' => 0
+ );
+
+ }
+
return $shares;
} else {
--
GitLab
From d17d838eccb4e8752fc59c2a6812d69a8a5b707e Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Mon, 11 Feb 2013 10:34:23 +0000
Subject: [PATCH 007/304] Updated specfile
---
apps/files_encryption/appinfo/spec.txt | 30 +++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index 2d22dffe08..7a937a9143 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -9,6 +9,31 @@ Encrypted files
[encrypted data string][delimiter][IV][padding]
[anhAAjAmcGXqj1X9g==][00iv00][MSHU5N5gECP7aAg7][xx] (square braces added)
+
+- Directory structure:
+ - Encrypted user data (catfiles) are stored in the usual /data/user/files dir
+ - Keyfiles are stored in /data/user/files_encryption/keyfiles
+ - Sharekey are stored in /data/user/files_encryption/share-files
+
+- File extensions:
+ - Catfiles have keep the file extension of the original file, pre-encryption
+ - Keyfiles use .keyfile
+ - Sharekeys have .shareKey
+
+Shared files
+------------
+
+Shared files have a centrally stored catfile and keyfile, and one sharekey for
+each user that shares it.
+
+When sharing is used, a different encryption method is used to encrypt the
+keyfile (openssl_seal). Although shared files have a keyfile, its contents
+use a different format therefore.
+
+Each time a shared file is edited or deleted, all sharekeys for users sharing
+that file must have their sharekeys changed also. The keyfile and catfile
+however need only changing in the owners files, as there is only one copy of
+these.
Notes
-----
@@ -16,4 +41,7 @@ Notes
- The user passphrase is required in order to set up or upgrade the app. New
keypair generation, and the re-encryption of legacy encrypted files requires
it. Therefore an appinfo/update.php script cannot be used, and upgrade logic
- is handled in the login hook listener.
\ No newline at end of file
+ is handled in the login hook listener. Therefore each time the user logs in
+ their files are scanned to detect unencrypted and legacy encrypted files, and
+ they are (re)encrypted as necessary. This may present a performance issue; we
+ need to monitor this.
\ No newline at end of file
--
GitLab
From 2787aafae6577dfad1f3db0dc70a8e0b05eaba53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 11 Feb 2013 12:12:21 +0100
Subject: [PATCH 008/304] added some TODOs
---
apps/files_encryption/hooks/hooks.php | 1 +
apps/files_encryption/lib/proxy.php | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 9252a341fb..b0075a3ada 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -190,6 +190,7 @@ class Hooks {
$util = new Util( $view, $share['userId'] );
// Check that the user is encryption capable
+ // TODO create encryption key when user gets created
if ( $util->ready() ) {
// Construct array of just UIDs for Keymanager{}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index b5e59e89b9..40ac411539 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -92,12 +92,13 @@ class Proxy extends \OC_FileProxy {
}
public function preFile_put_contents( $path, &$data ) {
-
+ // TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
if ( self::shouldEncrypt( $path ) ) {
// Stream put contents should have been converted to fopen
if ( !is_resource( $data ) ) {
+ // TODO check who is the owner of the file in case of shared folders
$userId = \OCP\USER::getUser();
$rootView = new \OC_FilesystemView( '/' );
$util = new Util( $rootView, $userId );
@@ -175,7 +176,7 @@ class Proxy extends \OC_FileProxy {
* @param string $data Data that has been read from file
*/
public function postFile_get_contents( $path, $data ) {
-
+ // TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
@@ -184,8 +185,8 @@ class Proxy extends \OC_FileProxy {
Crypt::mode() == 'server'
&& Crypt::isCatfile( $data )
) {
-
$view = new \OC_FilesystemView( '/' );
+ // TODO use get owner to find correct location of key files for shared files
$userId = \OCP\USER::getUser();
$session = new Session();
$util = new Util( $view, $userId );
--
GitLab
From 3e3cee98c87e90ece7a4a908b6cbbc7cbc94aac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 11 Feb 2013 13:28:37 +0100
Subject: [PATCH 009/304] - moved the enrcyption of the filekey ifg file gets
shared from the post shared hook to Crypt::encKeyfileToMultipleUsers()
because this can be reused if files get unshared - switch from preUnshare
hook to postUnshare hook because afterward we can simply get the updated
list of users with access to the file and call
Crypt::encKeyfileToMultipleUsers()
---
apps/files_encryption/appinfo/app.php | 4 +--
apps/files_encryption/hooks/hooks.php | 47 ++++++---------------------
apps/files_encryption/lib/crypt.php | 42 ++++++++++++++++++++++++
3 files changed, 54 insertions(+), 39 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index f83109a18e..6778e1faa3 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -16,8 +16,8 @@ OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'set
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshare', 'OCA\Encryption\Hooks', 'preUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
+OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
+OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
// Webdav-related hooks
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index b0075a3ada..c8565964ba 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -179,7 +179,6 @@ class Hooks {
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
- $session = new Session();
$shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'], 1 );
@@ -207,55 +206,29 @@ class Hooks {
}
}
-
- $userPubKeys = Keymanager::getPublicKeys( $view, $userIds );
-
- \OC_FileProxy::$enabled = false;
-
- // get the keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $userId, $params['fileTarget'] );
-
- $privateKey = $session->getPrivateKey();
-
- // decrypt the keyfile
- $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
-
- // re-enc keyfile to sharekeys
- $shareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
-
- // save sharekeys
- if ( ! Keymanager::setShareKeys( $view, $params['fileTarget'], $shareKeys['keys'] ) ) {
-
- trigger_error( "SET Share keys failed" );
-
- }
-
- // Delete existing keyfile
- // Do this last to ensure file is recoverable in case of error
-// Keymanager::deleteFileKey( $view, $userId, $params['fileTarget'] );
-
- \OC_FileProxy::$enabled = true;
-
- return true;
+
+ return Crypt::encKeyfileToMultipleUsers($shares, $params['fileTarget']);
}
/**
* @brief
*/
- public static function preUnshare( $params ) {
-
- // Delete existing catfile
+ public static function postUnshare( $params ) {
+ $shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'], 1 );
- // Generate new catfile and env keys
+ $userIds = array();
+ foreach ( $shares as $share ) {
+ $userIds[] = $share['userId'];
+ }
- // Save env keys to user folders
+ return Crypt::encKeyfileToMultipleUsers($userIDs, $params['fileTarget']);
}
/**
* @brief
*/
- public static function preUnshareAll( $params ) {
+ public static function postUnshareAll( $params ) {
trigger_error( "preUnshareAll" );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index fdee03eeaf..6704ea6bf1 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -744,4 +744,46 @@ class Crypt {
}
+
+ /**
+ * @brief encrypt file key to multiple users
+ * @param $users list of users which should be able to access the file
+ * @param $fileTarget target of the file
+ */
+ public static function encKeyfileToMultipleUsers($users, $fileTarget) {
+ $view = new \OC_FilesystemView( '/' );
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+ $session = new Session();
+
+ $userPubKeys = Keymanager::getPublicKeys( $view, $users );
+
+ \OC_FileProxy::$enabled = false;
+
+ // get the keyfile
+ $encKeyfile = Keymanager::getFileKey( $view, $userId, $fileTarget );
+
+ $privateKey = $session->getPrivateKey();
+
+ // decrypt the keyfile
+ $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
+
+ // re-enc keyfile to sharekeys
+ $shareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+
+ // save sharekeys
+ if ( ! Keymanager::setShareKeys( $view, $fileTarget, $shareKeys['keys'] ) ) {
+
+ trigger_error( "SET Share keys failed" );
+
+ }
+
+ // Delete existing keyfile
+ // Do this last to ensure file is recoverable in case of error
+ // Keymanager::deleteFileKey( $view, $userId, $params['fileTarget'] );
+
+ \OC_FileProxy::$enabled = true;
+
+ return true;
+ }
}
\ No newline at end of file
--
GitLab
From 9b498320903fc7d35e2e0bcfd03ebf69e7c90720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 11 Feb 2013 13:50:11 +0100
Subject: [PATCH 010/304] unshare all should work the same like unshare single
users
---
apps/files_encryption/hooks/hooks.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c8565964ba..550593daf6 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -229,9 +229,7 @@ class Hooks {
* @brief
*/
public static function postUnshareAll( $params ) {
-
- trigger_error( "preUnshareAll" );
-
+ return self::postUnshare($params);
}
}
--
GitLab
From 5a64c96d06db50c3ca13bb3c6c10c3a0e32a3380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 11 Feb 2013 15:13:42 +0100
Subject: [PATCH 011/304] go back to preUnshare hooks since sharing doesn't
trigger post unshare hooks
---
apps/files_encryption/appinfo/app.php | 4 ++--
apps/files_encryption/hooks/hooks.php | 19 +++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 6778e1faa3..f83109a18e 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -16,8 +16,8 @@ OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'set
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
+OCP\Util::connectHook( 'OCP\Share', 'pre_unshare', 'OCA\Encryption\Hooks', 'preUnshare' );
+OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
// Webdav-related hooks
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 550593daf6..17bcb9238a 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -157,8 +157,6 @@ class Hooks {
, \OC_Log::ERROR
);
- error_log( "Client side encryption is enabled but the client doesn't provide an encryption key for the file!" );
-
}
}
@@ -169,7 +167,7 @@ class Hooks {
* @brief
*/
public static function postShared( $params ) {
-
+ error_log("post shared triggered!");
// NOTE: $params is an array with these keys:
// itemSource -> int, filecache file ID
// shareWith -> string, uid of user being shared to
@@ -214,22 +212,27 @@ class Hooks {
/**
* @brief
*/
- public static function postUnshare( $params ) {
- $shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'], 1 );
+ public static function preUnshare( $params ) {
+ $items = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);
+ $shares = \OCP\Share::getUsersSharingFile( $item[0]['file_target'], 1 );
$userIds = array();
foreach ( $shares as $share ) {
$userIds[] = $share['userId'];
}
- return Crypt::encKeyfileToMultipleUsers($userIDs, $params['fileTarget']);
+ // remove the user from the list from which the file will be unshared
+ unset($userIds[$params['shareWith']]);
+
+ return Crypt::encKeyfileToMultipleUsers($userIDs, $item[0]['file_target']);
}
/**
* @brief
*/
- public static function postUnshareAll( $params ) {
- return self::postUnshare($params);
+ public static function preUnshareAll( $params ) {
+ $items = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);
+ return Crypt::encKeyfileToMultipleUsers(array($items[0]['uid_owner']), $items[0]['file_target']);
}
}
--
GitLab
From 8eef919a754ff3404df1065d616e66cb9b1ff437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 12 Feb 2013 12:08:34 +0100
Subject: [PATCH 012/304] take group shares into account if we retrieve the
list a all recipients
---
apps/files_encryption/hooks/hooks.php | 35 +++------------
apps/files_encryption/lib/crypt.php | 30 +++++++++++--
lib/public/share.php | 65 +++++++++++++--------------
3 files changed, 63 insertions(+), 67 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 17bcb9238a..c14ce3e91d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -167,44 +167,21 @@ class Hooks {
* @brief
*/
public static function postShared( $params ) {
- error_log("post shared triggered!");
+
// NOTE: $params is an array with these keys:
// itemSource -> int, filecache file ID
// shareWith -> string, uid of user being shared to
// fileTarget -> path of file being shared
// uidOwner -> owner of the original file being shared
+ //TODO: We don't deal with shared folder yet, need to recursively update every file in the folder
+
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
- $shares = \OCP\Share::getUsersSharingFile( $params['fileTarget'], 1 );
-
- $userIds = array();
-
- foreach ( $shares as $share ) {
-
- $util = new Util( $view, $share['userId'] );
-
- // Check that the user is encryption capable
- // TODO create encryption key when user gets created
- if ( $util->ready() ) {
-
- // Construct array of just UIDs for Keymanager{}
- $userIds[] = $share['userId'];
-
- } else {
-
- // Log warning; we can't do necessary setup here
- // because we don't have the user passphrase
- // TODO: Provide user feedback indicating that
- // sharing failed
- \OC_Log::write( 'Encryption library', 'File cannot be shared: user "'.$share['userId'].'" is not setup for encryption', \OC_Log::WARN );
-
- }
+ $shares = \OCP\Share::getUsersSharingFile( $params['itemSource'], 1 );
- }
-
return Crypt::encKeyfileToMultipleUsers($shares, $params['fileTarget']);
}
@@ -213,11 +190,11 @@ class Hooks {
* @brief
*/
public static function preUnshare( $params ) {
- $items = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);
- $shares = \OCP\Share::getUsersSharingFile( $item[0]['file_target'], 1 );
+ $shares = \OCP\Share::getUsersSharingFile( $params['itemSource'], 1 );
$userIds = array();
foreach ( $shares as $share ) {
+ error_log("keek user id: " . $share['userId']);
$userIds[] = $share['userId'];
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 6704ea6bf1..a8cc2b3726 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -752,16 +752,40 @@ class Crypt {
*/
public static function encKeyfileToMultipleUsers($users, $fileTarget) {
$view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
+ $owner = \OCP\User::getUser();
$util = new Util( $view, $userId );
$session = new Session();
+
+ $userIds = array();
+
+ foreach ( $users as $user ) {
+
+ $util = new Util( $view, $user );
+
+ // Check that the user is encryption capable
+ if ( $util->ready() ) {
+ // Construct array of just UIDs for Keymanager{}
+ $userIds[] = $user;
+
+ } else {
+
+ // Log warning; we can't do necessary setup here
+ // because we don't have the user passphrase
+ // TODO: Provide user feedback indicating that
+ // sharing failed
+ \OC_Log::write( 'Encryption library', 'File cannot be shared: user "'.$user.'" is not setup for encryption', \OC_Log::WARN );
+
+ }
+
+ }
+
- $userPubKeys = Keymanager::getPublicKeys( $view, $users );
+ $userPubKeys = Keymanager::getPublicKeys( $view, $userIds );
\OC_FileProxy::$enabled = false;
// get the keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $userId, $fileTarget );
+ $encKeyfile = Keymanager::getFileKey( $view, $owner, $fileTarget );
$privateKey = $session->getPrivateKey();
diff --git a/lib/public/share.php b/lib/public/share.php
index 4170783d71..841240692d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -149,62 +149,57 @@ class Share {
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $path, $includeOwner = 0 ) {
-
- $fPath = self::prepFileTarget( $path );
-
+ public static function getUsersSharingFile( $source, $includeOwner = 0 ) {
+ //TODO get also the recipients from folders which are shared above the current file
// Fetch all shares of this file path from DB
$query = \OC_DB::prepare(
- 'SELECT
- share_type
- , share_with
- , uid_owner
- , permissions
+ 'SELECT share_with
FROM
`*PREFIX*share`
WHERE
- file_target = ?'
+ item_source = ? AND share_type = ? AND uid_owner = ?'
);
- $result = $query->execute( array( $fPath ) );
+ $result = $query->execute( array( $source, self::SHARE_TYPE_USER, \OCP\User::getUser() ) );
if ( \OC_DB::isError( $result ) ) {
-
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result) . ', path=' . $fPath, \OC_Log::ERROR );
-
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
}
$shares = array();
while( $row = $result->fetchRow() ) {
+ $shares[] = $row['share_with'];
+ }
- // Set helpful array keys
- $shares[] = array(
- 'userId' => $row['share_with']
- , 'owner' => $row['uid_owner'] // we just set this so it can be used once, hugly hack :/
- , 'shareType' => $row['share_type']
- , 'permissions' => $row['permissions']
- );
+ // We also need to take group shares into account
+
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ? AND uid_owner = ?'
+ );
+ $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP, \OCP\User::getUser() ) );
+
+ if ( \OC_DB::isError( $result ) ) {
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
}
+ while( $row = $result->fetchRow() ) {
+ $usersInGroup = \OC_Group::usersInGroup($row['share_with']);
+ $shares = array_merge($shares, $usersInGroup);
+ }
+
if ( ! empty( $shares ) ) {
-
// Include owner in list of users, if requested
if ( $includeOwner == 1 ) {
-
- // NOTE: The values are incorrect for shareType and
- // permissions of the owner; we just include them for
- // optional convenience
- $shares[] = array(
- 'userId' => $shares[0]['owner']
- , 'shareType' => 0
- , 'permissions' => 0
- );
-
+ $shares[] = \OCP\User::getUser();
}
-
- return $shares;
+
+ return array_unique($shares);
} else {
@@ -235,7 +230,7 @@ class Share {
public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) {
return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections);
}
-
+
/**
* @brief Get the item of item type shared with the current user by source
* @param string Item type
--
GitLab
From 1e5d03da800e5ad36e7b5adbab7eef03a2add80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 12 Feb 2013 12:45:54 +0100
Subject: [PATCH 013/304] use right location of the file is the source and not
the target it is shared to
---
apps/files_encryption/hooks/hooks.php | 32 ++++++++++++++++-----------
apps/files_encryption/lib/crypt.php | 6 ++---
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c14ce3e91d..ebc345a47e 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -163,6 +163,20 @@ class Hooks {
}
+ /**
+ * @brief get path of a file.
+ * @param $fileId id of the file
+ * @return path of the file
+ */
+ private static function getFilePath($fileId) {
+ $query = \OC_DB::prepare('SELECT `path`'
+ .' FROM `*PREFIX*filecache`'
+ .' WHERE `fileid` = ?');
+ $result = $query->execute(array($fileId));
+ $row = $result->fetchRow();
+ return $row['path'];
+ }
+
/**
* @brief
*/
@@ -182,7 +196,7 @@ class Hooks {
$shares = \OCP\Share::getUsersSharingFile( $params['itemSource'], 1 );
- return Crypt::encKeyfileToMultipleUsers($shares, $params['fileTarget']);
+ return Crypt::encKeyfileToMultipleUsers($shares, self::getFilePath($params['itemSource']));
}
@@ -191,25 +205,17 @@ class Hooks {
*/
public static function preUnshare( $params ) {
$shares = \OCP\Share::getUsersSharingFile( $params['itemSource'], 1 );
-
- $userIds = array();
- foreach ( $shares as $share ) {
- error_log("keek user id: " . $share['userId']);
- $userIds[] = $share['userId'];
- }
-
// remove the user from the list from which the file will be unshared
- unset($userIds[$params['shareWith']]);
-
- return Crypt::encKeyfileToMultipleUsers($userIDs, $item[0]['file_target']);
+ unset($shares[$params['shareWith']]);
+
+ return Crypt::encKeyfileToMultipleUsers($shares, self::getFilePath($params['itemSource']));
}
/**
* @brief
*/
public static function preUnshareAll( $params ) {
- $items = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);
- return Crypt::encKeyfileToMultipleUsers(array($items[0]['uid_owner']), $items[0]['file_target']);
+ return Crypt::encKeyfileToMultipleUsers(array(\OCP\User::getUser()), self::getFilePath($params['itemSource']));
}
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index a8cc2b3726..cbdae323e5 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -750,7 +750,7 @@ class Crypt {
* @param $users list of users which should be able to access the file
* @param $fileTarget target of the file
*/
- public static function encKeyfileToMultipleUsers($users, $fileTarget) {
+ public static function encKeyfileToMultipleUsers($users, $filePath) {
$view = new \OC_FilesystemView( '/' );
$owner = \OCP\User::getUser();
$util = new Util( $view, $userId );
@@ -785,7 +785,7 @@ class Crypt {
\OC_FileProxy::$enabled = false;
// get the keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $owner, $fileTarget );
+ $encKeyfile = Keymanager::getFileKey( $view, $owner, $filePath );
$privateKey = $session->getPrivateKey();
@@ -796,7 +796,7 @@ class Crypt {
$shareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
// save sharekeys
- if ( ! Keymanager::setShareKeys( $view, $fileTarget, $shareKeys['keys'] ) ) {
+ if ( ! Keymanager::setShareKeys( $view, $filePath, $shareKeys['keys'] ) ) {
trigger_error( "SET Share keys failed" );
--
GitLab
From d1bbb30385260d77b01bc5998465ebe68ccd83d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 12 Feb 2013 16:48:04 +0100
Subject: [PATCH 014/304] also find users with access to the file if a folder
above the actual file was already shared
---
apps/files_encryption/hooks/hooks.php | 30 +++------
apps/files_encryption/lib/crypt.php | 2 -
apps/files_encryption/lib/util.php | 14 ++++
lib/public/share.php | 97 ++++++++++++++-------------
4 files changed, 75 insertions(+), 68 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index ebc345a47e..ffd3e4544f 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -164,21 +164,7 @@ class Hooks {
}
/**
- * @brief get path of a file.
- * @param $fileId id of the file
- * @return path of the file
- */
- private static function getFilePath($fileId) {
- $query = \OC_DB::prepare('SELECT `path`'
- .' FROM `*PREFIX*filecache`'
- .' WHERE `fileid` = ?');
- $result = $query->execute(array($fileId));
- $row = $result->fetchRow();
- return $row['path'];
- }
-
- /**
- * @brief
+ * @brief get all users with access to the file and encrypt the file key to each of them
*/
public static function postShared( $params ) {
@@ -194,9 +180,11 @@ class Hooks {
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
- $shares = \OCP\Share::getUsersSharingFile( $params['itemSource'], 1 );
+ $path = Util::getFilePath($params['itemSource']);
+
+ $shares = \OCP\Share::getUsersSharingFile( $path, 1 );
- return Crypt::encKeyfileToMultipleUsers($shares, self::getFilePath($params['itemSource']));
+ return Crypt::encKeyfileToMultipleUsers($shares, $path);
}
@@ -204,18 +192,20 @@ class Hooks {
* @brief
*/
public static function preUnshare( $params ) {
- $shares = \OCP\Share::getUsersSharingFile( $params['itemSource'], 1 );
+
+ $path = Util::getFilePath($params['itemSource']);
+ $shares = \OCP\Share::getUsersSharingFile( $path, 1 );
// remove the user from the list from which the file will be unshared
unset($shares[$params['shareWith']]);
- return Crypt::encKeyfileToMultipleUsers($shares, self::getFilePath($params['itemSource']));
+ return Crypt::encKeyfileToMultipleUsers($shares, $path );
}
/**
* @brief
*/
public static function preUnshareAll( $params ) {
- return Crypt::encKeyfileToMultipleUsers(array(\OCP\User::getUser()), self::getFilePath($params['itemSource']));
+ return Crypt::encKeyfileToMultipleUsers(array(\OCP\User::getUser()), Util::getFilePath($params['itemSource']));
}
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index cbdae323e5..ba9f0cb9a2 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -450,9 +450,7 @@ class Crypt {
* @returns encrypted file
*/
public static function keyEncrypt( $plainContent, $publicKey ) {
-
openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
-
return $encryptedContent;
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 52bc74db27..843727d7ab 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -472,5 +472,19 @@ class Util {
}
}
+
+ /**
+ * @brief get path of a file.
+ * @param $fileId id of the file
+ * @return path of the file
+ */
+ public static function getFilePath($fileId) {
+ $query = \OC_DB::prepare('SELECT `path`'
+ .' FROM `*PREFIX*filecache`'
+ .' WHERE `fileid` = ?');
+ $result = $query->execute(array($fileId));
+ $row = $result->fetchRow();
+ return substr($row['path'], 5);
+ }
}
diff --git a/lib/public/share.php b/lib/public/share.php
index 841240692d..55ff4d4738 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -149,64 +149,69 @@ class Share {
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $source, $includeOwner = 0 ) {
- //TODO get also the recipients from folders which are shared above the current file
- // Fetch all shares of this file path from DB
- $query = \OC_DB::prepare(
- 'SELECT share_with
- FROM
- `*PREFIX*share`
- WHERE
- item_source = ? AND share_type = ? AND uid_owner = ?'
- );
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_USER, \OCP\User::getUser() ) );
-
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
- }
-
+ public static function getUsersSharingFile( $path, $includeOwner = 0 ) {
+
+ $user = \OCP\User::getUser();
+ $path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
+ $path = '';
$shares = array();
- while( $row = $result->fetchRow() ) {
- $shares[] = $row['share_with'];
- }
-
- // We also need to take group shares into account
-
- $query = \OC_DB::prepare(
- 'SELECT share_with
- FROM
- `*PREFIX*share`
- WHERE
- item_source = ? AND share_type = ? AND uid_owner = ?'
- );
+ foreach ($path_parts as $p) {
+ $path .= '/'.$p;
+ $meta = \OC\Files\Filesystem::getFileInfo(\OC_Filesystem::normalizePath($path));
+ $source = $meta['fileid'];
- $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP, \OCP\User::getUser() ) );
-
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
- }
-
- while( $row = $result->fetchRow() ) {
- $usersInGroup = \OC_Group::usersInGroup($row['share_with']);
- $shares = array_merge($shares, $usersInGroup);
+ // Fetch all shares of this file path from DB
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ? AND uid_owner = ?'
+ );
+
+ $result = $query->execute( array( $source, self::SHARE_TYPE_USER, $user ) );
+
+ if ( \OC_DB::isError( $result ) ) {
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ }
+
+ while( $row = $result->fetchRow() ) {
+ $shares[] = $row['share_with'];
+ }
+
+ // We also need to take group shares into account
+
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ? AND uid_owner = ?'
+ );
+
+ $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP, $user ) );
+
+ if ( \OC_DB::isError( $result ) ) {
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ }
+
+ while( $row = $result->fetchRow() ) {
+ $usersInGroup = \OC_Group::usersInGroup($row['share_with']);
+ $shares = array_merge($shares, $usersInGroup);
+ }
}
-
+
if ( ! empty( $shares ) ) {
// Include owner in list of users, if requested
if ( $includeOwner == 1 ) {
- $shares[] = \OCP\User::getUser();
+ $shares[] = $user;
}
-
return array_unique($shares);
-
} else {
-
return false;
-
}
-
+
}
/**
--
GitLab
From a692264fa416fec44d774bd955a06a65c7c0d158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 12 Feb 2013 17:00:33 +0100
Subject: [PATCH 015/304] add option to keep duplicates in the list of users
with access to a file, e.g. for the unshare operation we need to know if
access was granted more than once, for example as group share and as
individual share
---
apps/files_encryption/hooks/hooks.php | 6 +++---
apps/files_encryption/lib/proxy.php | 11 ++---------
lib/public/share.php | 17 +++++++++++------
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index ffd3e4544f..5e06948aa5 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -182,7 +182,7 @@ class Hooks {
$path = Util::getFilePath($params['itemSource']);
- $shares = \OCP\Share::getUsersSharingFile( $path, 1 );
+ $shares = \OCP\Share::getUsersSharingFile( $path, true );
return Crypt::encKeyfileToMultipleUsers($shares, $path);
@@ -194,11 +194,11 @@ class Hooks {
public static function preUnshare( $params ) {
$path = Util::getFilePath($params['itemSource']);
- $shares = \OCP\Share::getUsersSharingFile( $path, 1 );
+ $shares = \OCP\Share::getUsersSharingFile( $path, true, false );
// remove the user from the list from which the file will be unshared
unset($shares[$params['shareWith']]);
- return Crypt::encKeyfileToMultipleUsers($shares, $path );
+ return Crypt::encKeyfileToMultipleUsers(array_unique($shares), $path );
}
/**
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 40ac411539..3e4178e8a8 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -118,15 +118,8 @@ class Proxy extends \OC_FileProxy {
// $fileOwner = \OC\Files\Filesystem::getOwner( $path );
// List everyone sharing the file
- $shares = \OCP\Share::getUsersSharingFile( $filePath, 1 );
-
- $userIds = array();
-
- foreach ( $shares as $share ) {
-
- $userIds[] = $share['userId'];
-
- }
+ //TODO check, is this path always the path to the source file?
+ $userIds = \OCP\Share::getUsersSharingFile( $filePath, true );
$publicKeys = Keymanager::getPublicKeys( $rootView, $userIds );
diff --git a/lib/public/share.php b/lib/public/share.php
index 55ff4d4738..68f5e93baa 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -145,11 +145,14 @@ class Share {
/**
* @brief Find which users can access a shared item
- * @return bool / array
+ * @param $path to the file
+ * @param include owner to the list of users with access to the file
+ * @param remove duplicates in the result
+ * @return array
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $path, $includeOwner = 0 ) {
+ public static function getUsersSharingFile( $path, $includeOwner = false, $removeDuplicates = true ) {
$user = \OCP\User::getUser();
$path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
@@ -204,14 +207,16 @@ class Share {
if ( ! empty( $shares ) ) {
// Include owner in list of users, if requested
- if ( $includeOwner == 1 ) {
+ if ( $includeOwner ) {
$shares[] = $user;
}
+ }
+
+ if ( $removeDuplicates )
return array_unique($shares);
- } else {
- return false;
+ else {
+ return $shares;
}
-
}
/**
--
GitLab
From 4952dfe95657ba52f1b39f958100659539831ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 13 Feb 2013 14:56:39 +0100
Subject: [PATCH 016/304] add post_unshare hook, also add public link shares to
the list of user with access to a file
---
apps/files_encryption/appinfo/app.php | 2 +-
apps/files_encryption/hooks/hooks.php | 9 +++----
apps/files_encryption/lib/crypt.php | 4 ++-
lib/public/share.php | 35 +++++++++++++++++++++------
4 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index f83109a18e..932e8855d0 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -16,7 +16,7 @@ OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'set
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshare', 'OCA\Encryption\Hooks', 'preUnshare' );
+OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
// Webdav-related hooks
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 5e06948aa5..ae05ba7801 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -176,6 +176,8 @@ class Hooks {
//TODO: We don't deal with shared folder yet, need to recursively update every file in the folder
+ if ($params['shareType'] == \OCP\Share::SHARE_TYPE_LINK)
+
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
@@ -191,12 +193,9 @@ class Hooks {
/**
* @brief
*/
- public static function preUnshare( $params ) {
-
+ public static function postUnshare( $params ) {
$path = Util::getFilePath($params['itemSource']);
- $shares = \OCP\Share::getUsersSharingFile( $path, true, false );
- // remove the user from the list from which the file will be unshared
- unset($shares[$params['shareWith']]);
+ $shares = \OCP\Share::getUsersSharingFile( $path, true );
return Crypt::encKeyfileToMultipleUsers(array_unique($shares), $path );
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ba9f0cb9a2..0f465d7d95 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -450,7 +450,9 @@ class Crypt {
* @returns encrypted file
*/
public static function keyEncrypt( $plainContent, $publicKey ) {
- openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+
+ if (openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey )) error_log("feinifeine"); else error_log("ups");
+
return $encryptedContent;
}
diff --git a/lib/public/share.php b/lib/public/share.php
index 68f5e93baa..f691ae9b39 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -147,7 +147,6 @@ class Share {
* @brief Find which users can access a shared item
* @param $path to the file
* @param include owner to the list of users with access to the file
- * @param remove duplicates in the result
* @return array
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
@@ -203,6 +202,25 @@ class Share {
$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
$shares = array_merge($shares, $usersInGroup);
}
+
+ //check for public link shares
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ? AND uid_owner = ?'
+ );
+
+ $result = $query->execute( array( $source, self::SHARE_TYPE_LINK, $user ) );
+
+ if ( \OC_DB::isError( $result ) ) {
+ \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ }
+
+ if ($result->fetchRow()) {
+ $shares[] = self::SHARE_TYPE_LINK;
+ }
}
if ( ! empty( $shares ) ) {
@@ -212,11 +230,8 @@ class Share {
}
}
- if ( $removeDuplicates )
- return array_unique($shares);
- else {
- return $shares;
- }
+ return array_unique($shares);
+
}
/**
@@ -475,8 +490,14 @@ class Share {
'itemSource' => $itemSource,
'shareType' => $shareType,
'shareWith' => $shareWith,
- ));
+ ));
self::delete($item['id']);
+ \OC_Hook::emit('OCP\Share', 'post_unshare', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith,
+ ));
return true;
}
return false;
--
GitLab
From 9356f9a6bf6e9bd048e31e787d5fcb621de8eebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 13 Feb 2013 17:23:27 +0100
Subject: [PATCH 017/304] add post_unshareALll hook, update recursively all
keyfiles if a folder was shared/unshared
---
apps/files_encryption/appinfo/app.php | 2 +-
apps/files_encryption/hooks/hooks.php | 15 +++++------
apps/files_encryption/lib/crypt.php | 36 ++++++++++++++++++++++++++-
lib/public/share.php | 5 ++++
4 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 932e8855d0..6778e1faa3 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -17,7 +17,7 @@ OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'set
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
+OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
// Webdav-related hooks
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index ae05ba7801..34ed11c7e2 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -176,17 +176,13 @@ class Hooks {
//TODO: We don't deal with shared folder yet, need to recursively update every file in the folder
- if ($params['shareType'] == \OCP\Share::SHARE_TYPE_LINK)
-
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = Util::getFilePath($params['itemSource']);
- $shares = \OCP\Share::getUsersSharingFile( $path, true );
-
- return Crypt::encKeyfileToMultipleUsers($shares, $path);
+ return Crypt::updateKeyfile($path);
}
@@ -195,16 +191,17 @@ class Hooks {
*/
public static function postUnshare( $params ) {
$path = Util::getFilePath($params['itemSource']);
- $shares = \OCP\Share::getUsersSharingFile( $path, true );
- return Crypt::encKeyfileToMultipleUsers(array_unique($shares), $path );
+ return Crypt::updateKeyfile($path);
}
/**
* @brief
*/
- public static function preUnshareAll( $params ) {
- return Crypt::encKeyfileToMultipleUsers(array(\OCP\User::getUser()), Util::getFilePath($params['itemSource']));
+ public static function postUnshareAll( $params ) {
+ $path = Util::getFilePath($params['itemSource']);
+
+ return Crypt::updateKeyfile($path);
}
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 0f465d7d95..18e9535bf3 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -750,7 +750,7 @@ class Crypt {
* @param $users list of users which should be able to access the file
* @param $fileTarget target of the file
*/
- public static function encKeyfileToMultipleUsers($users, $filePath) {
+ private static function encKeyfileToMultipleUsers($users, $filePath) {
$view = new \OC_FilesystemView( '/' );
$owner = \OCP\User::getUser();
$util = new Util( $view, $userId );
@@ -810,4 +810,38 @@ class Crypt {
return true;
}
+
+ /**
+ * @brief update keyfile encryption for given path and all sub folders/files
+ * @param path which needs to be updated
+ * @return bool success
+ */
+ public static function updateKeyfile($path) {
+
+ $filesView = \OCP\Files::getStorage('files');
+
+ $result = true;
+
+ if ( $filesView->is_dir($path) ) {
+ $content = $filesView->getDirectoryContent($path);
+ foreach ( $content as $c) {
+ $path = substr($c['path'], 5);
+ if ( $filesView->is_dir($path) ) {
+ error_log("dive into $path");
+ $result &= self::updateKeyfile($path);
+ } else {
+ error_log("encKeyFileToMultipleUsers $path");
+ $shares = \OCP\Share::getUsersSharingFile( $path, true );
+ $result &= self::encKeyfileToMultipleUsers($shares, $path);
+ }
+ }
+ } else {
+ error_log("encKeyFileToMultipleUsers single file: " . $path);
+ $shares = \OCP\Share::getUsersSharingFile( $path, true );
+ $result = self::encKeyfileToMultipleUsers($shares, $path);
+ }
+
+ return $result;
+
+ }
}
\ No newline at end of file
diff --git a/lib/public/share.php b/lib/public/share.php
index f691ae9b39..d1297c6e59 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -520,6 +520,11 @@ class Share {
foreach ($shares as $share) {
self::delete($share['id']);
}
+ \OC_Hook::emit('OCP\Share', 'post_unshareAll', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'shares' => $shares
+ ));
return true;
}
return false;
--
GitLab
From 5005195db005fd0d7c8fdf1a73e12c4a4619acb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 13 Feb 2013 17:57:45 +0100
Subject: [PATCH 018/304] create keypair for ownCloud with empty passphrase,
will be used for public link shares
---
apps/files_encryption/lib/crypt.php | 5 +----
apps/files_encryption/lib/session.php | 28 +++++++++++++++++++++++++++
lib/public/share.php | 2 +-
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 18e9535bf3..2e5912a868 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -763,7 +763,7 @@ class Crypt {
$util = new Util( $view, $user );
// Check that the user is encryption capable
- if ( $util->ready() ) {
+ if ( $util->ready() && $user == 'ownCloud' ) {
// Construct array of just UIDs for Keymanager{}
$userIds[] = $user;
@@ -827,16 +827,13 @@ class Crypt {
foreach ( $content as $c) {
$path = substr($c['path'], 5);
if ( $filesView->is_dir($path) ) {
- error_log("dive into $path");
$result &= self::updateKeyfile($path);
} else {
- error_log("encKeyFileToMultipleUsers $path");
$shares = \OCP\Share::getUsersSharingFile( $path, true );
$result &= self::encKeyfileToMultipleUsers($shares, $path);
}
}
} else {
- error_log("encKeyFileToMultipleUsers single file: " . $path);
$shares = \OCP\Share::getUsersSharingFile( $path, true );
$result = self::encKeyfileToMultipleUsers($shares, $path);
}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 769a40b359..ebf7edcd71 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -27,6 +27,34 @@ namespace OCA\Encryption;
*/
class Session {
+
+ /**
+ * @brief if session is started, check if ownCloud key pair is set up, if not create it
+ *
+ * The ownCloud key pair is used to allow public link sharing even if encryption is enabled
+ */
+ public function __construct() {
+ $view = new \OC\Files\View('/');
+ if (!$view->is_dir('owncloud_private_key')) {
+ $view->mkdir('owncloud_private_key');
+ }
+
+ if (!$view->file_exists("/public-keys/owncloud.public.key") || !$view->file_exists("/owncloud_private_key/owncloud.private.key") ) {
+
+ $keypair = Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+ // Save public key
+ $view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
+ // Save private key
+ error_log("encrypted private key: " . $encryptedPrivateKey );
+ $view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey );
+
+ \OC_FileProxy::$enabled = true;
+ }
+ }
/**
* @brief Sets user private key to session
diff --git a/lib/public/share.php b/lib/public/share.php
index d1297c6e59..720337c3c3 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -219,7 +219,7 @@ class Share {
}
if ($result->fetchRow()) {
- $shares[] = self::SHARE_TYPE_LINK;
+ $shares[] = "ownCloud";
}
}
--
GitLab
From 8c35bbcba75590d5f66ecf08a4dd07db3fd23732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 14 Feb 2013 16:33:57 +0100
Subject: [PATCH 019/304] remove debug output, fix typo in file names
---
apps/files_encryption/lib/session.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index ebf7edcd71..171a6900f0 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -34,23 +34,23 @@ class Session {
* The ownCloud key pair is used to allow public link sharing even if encryption is enabled
*/
public function __construct() {
+
$view = new \OC\Files\View('/');
if (!$view->is_dir('owncloud_private_key')) {
$view->mkdir('owncloud_private_key');
}
if (!$view->file_exists("/public-keys/owncloud.public.key") || !$view->file_exists("/owncloud_private_key/owncloud.private.key") ) {
-
+
$keypair = Crypt::createKeypair();
\OC_FileProxy::$enabled = false;
// Save public key
- $view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
+ $view->file_put_contents( '/public-keys/ownCloud.public.key', $keypair['publicKey'] );
// Encrypt private key empthy passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
// Save private key
- error_log("encrypted private key: " . $encryptedPrivateKey );
- $view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey );
+ $view->file_put_contents( '/owncloud_private_key/ownCloud.private.key', $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
}
--
GitLab
From 109fee7673f1c3f395da47ae7114fba3354fa22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 19 Feb 2013 14:47:45 +0100
Subject: [PATCH 020/304] remove todo, it is already solved
---
apps/files_encryption/hooks/hooks.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 34ed11c7e2..5020724657 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -174,8 +174,6 @@ class Hooks {
// fileTarget -> path of file being shared
// uidOwner -> owner of the original file being shared
- //TODO: We don't deal with shared folder yet, need to recursively update every file in the folder
-
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
--
GitLab
From fd629983fa61ad7fdc1c6696e6b2fa1739ae6f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 19 Feb 2013 17:10:32 +0100
Subject: [PATCH 021/304] remove debug output
---
apps/files_encryption/lib/crypt.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 2e5912a868..a1684fc95f 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -451,7 +451,7 @@ class Crypt {
*/
public static function keyEncrypt( $plainContent, $publicKey ) {
- if (openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey )) error_log("feinifeine"); else error_log("ups");
+ openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
return $encryptedContent;
--
GitLab
From 14ae373dfe86b34b3e027306b5f857a3f38ff418 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 19 Feb 2013 17:41:38 +0000
Subject: [PATCH 022/304] Fixed wrong array key reference
---
apps/files_encryption/lib/crypt.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index a1684fc95f..49b75c17f6 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -371,7 +371,7 @@ class Crypt {
* @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
- * @returns array keys: keys (array, key = userId), encrypted
+ * @returns array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
--
GitLab
From 1b880f2f96df514c68a17e90141cff9620c2ddb5 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 19 Feb 2013 19:16:50 +0000
Subject: [PATCH 023/304] Moved dependencies out of Crypt methods
(encKeyfileToMultipleUsers)(DI) Fixed bug preventing sharing with users other
than 'ownCloud' Added comments Moved functionality into
filterShareReadyUsers() Other changes
---
apps/files_encryption/appinfo/app.php | 2 +-
apps/files_encryption/hooks/hooks.php | 23 +++++--
apps/files_encryption/lib/crypt.php | 97 ++++++++++++++-------------
apps/files_encryption/lib/util.php | 41 +++++++++++
4 files changed, 109 insertions(+), 54 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 6778e1faa3..742e4add8f 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -20,7 +20,7 @@ OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'pos
OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
// Webdav-related hooks
-OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
+OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 5020724657..1ebfdb1ae0 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -139,7 +139,7 @@ class Hooks {
/**
* @brief update the encryption key of the file uploaded by the client
*/
- public static function updateKeyfile( $params ) {
+ public static function updateKeyfileFromClient( $params ) {
if ( Crypt::mode() == 'client' ) {
@@ -175,12 +175,13 @@ class Hooks {
// uidOwner -> owner of the original file being shared
$view = new \OC_FilesystemView( '/' );
+ $session = new Session();
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
- $path = Util::getFilePath($params['itemSource']);
+ $path = Util::getFilePath( $params['itemSource'] );
- return Crypt::updateKeyfile($path);
+ return Crypt::updateKeyfile( $view, $session, $path );
}
@@ -188,18 +189,26 @@ class Hooks {
* @brief
*/
public static function postUnshare( $params ) {
- $path = Util::getFilePath($params['itemSource']);
+
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session();
+ $path = Util::getFilePath( $params['itemSource'] );
+
+ return Crypt::updateKeyfile( $view, $session, $path );
- return Crypt::updateKeyfile($path);
}
/**
* @brief
*/
public static function postUnshareAll( $params ) {
- $path = Util::getFilePath($params['itemSource']);
+
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session();
+ $path = Util::getFilePath( $params['itemSource'] );
+
+ return Crypt::updateKeyfile( $view, $session, $path );
- return Crypt::updateKeyfile($path);
}
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 49b75c17f6..1b0167834e 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -746,52 +746,44 @@ class Crypt {
/**
- * @brief encrypt file key to multiple users
- * @param $users list of users which should be able to access the file
- * @param $fileTarget target of the file
+ * @brief Encrypt keyfile to multiple users
+ * @param array $users list of users which should be able to access the file
+ * @param string $filePath path of the file to be shared
*/
- private static function encKeyfileToMultipleUsers($users, $filePath) {
- $view = new \OC_FilesystemView( '/' );
- $owner = \OCP\User::getUser();
- $util = new Util( $view, $userId );
- $session = new Session();
+ private static function encKeyfileToMultipleUsers( \OC_FilesystemView $view, Util $util, Session $session, $userId, array $users, $filePath ) {
+
+ // Make sure users are capable of sharing
+ $filteredUids = $util->filterShareReadyUsers( $users );
- $userIds = array();
+ // Get public keys for each user, ready for generating sharekeys
+ $userPubKeys = Keymanager::getPublicKeys( $view, $filteredUids ); // TODO: check this includes the owner's public key
+
+ \OC_FileProxy::$enabled = false;
+
+ // Get the current users's private key for decrypting existing keyfile
+ $privateKey = $session->getPrivateKey();
- foreach ( $users as $user ) {
+ // We need to get a decrypted key for the file
+ // Determine how to decrypt the keyfile by checking if current user is owner
+ if ( $userId == \OC\Files\Filesystem::getOwner( $filePath ) ) {
- $util = new Util( $view, $user );
-
- // Check that the user is encryption capable
- if ( $util->ready() && $user == 'ownCloud' ) {
- // Construct array of just UIDs for Keymanager{}
- $userIds[] = $user;
-
- } else {
-
- // Log warning; we can't do necessary setup here
- // because we don't have the user passphrase
- // TODO: Provide user feedback indicating that
- // sharing failed
- \OC_Log::write( 'Encryption library', 'File cannot be shared: user "'.$user.'" is not setup for encryption', \OC_Log::WARN );
+ // If current user is owner, decrypt without using sharekey
- }
+ } else {
+
+ // Current user is resharing a file they don't own
+ // Decrypt keyfile using sharekey
}
-
- $userPubKeys = Keymanager::getPublicKeys( $view, $userIds );
-
- \OC_FileProxy::$enabled = false;
-
- // get the keyfile
+ // get the existing keyfile
$encKeyfile = Keymanager::getFileKey( $view, $owner, $filePath );
- $privateKey = $session->getPrivateKey();
-
- // decrypt the keyfile
+ // decrypt the existing keyfile
$plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
-
+
+ trigger_error("PUBKEYS = ". var_export($userPubKeys, 1));
+
// re-enc keyfile to sharekeys
$shareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
@@ -816,29 +808,42 @@ class Crypt {
* @param path which needs to be updated
* @return bool success
*/
- public static function updateKeyfile($path) {
+ public static function updateKeyfile( \OC_FilesystemView $view, Util $util, Session $session, $path ) {
- $filesView = \OCP\Files::getStorage('files');
+ // Make path include 'files' dir for OC_FSV operations
+ $fPath = 'files' . $path;
$result = true;
- if ( $filesView->is_dir($path) ) {
- $content = $filesView->getDirectoryContent($path);
- foreach ( $content as $c) {
+ if ( ! $view->is_dir( $fPath ) ) {
+
+ $shares = \OCP\Share::getUsersSharingFile( $path, true );
+ $result = self::encKeyfileToMultipleUsers( $view, $util, $session, $shares, $path );
+
+ } else {
+
+ $content = $view->getDirectoryContent( $fPath );
+
+ foreach ( $content as $c ) {
+
$path = substr($c['path'], 5);
- if ( $filesView->is_dir($path) ) {
- $result &= self::updateKeyfile($path);
+
+ if ( $view->is_dir( $fPath ) ) {
+
+ $result &= self::updateKeyfile( $path );
+
} else {
+
$shares = \OCP\Share::getUsersSharingFile( $path, true );
- $result &= self::encKeyfileToMultipleUsers($shares, $path);
+ $result &= self::encKeyfileToMultipleUsers( $view, $util, $session, $shares, $path );
+
}
}
- } else {
- $shares = \OCP\Share::getUsersSharingFile( $path, true );
- $result = self::encKeyfileToMultipleUsers($shares, $path);
+
}
return $result;
}
+
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 843727d7ab..8ca51c95d7 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -486,5 +486,46 @@ class Util {
$row = $result->fetchRow();
return substr($row['path'], 5);
}
+
+ /**
+ * @brief Filter an array of UIDs to return only ones ready for sharing
+ * @param array $unfilteredUsers users to be checked for sharing readiness
+ * @return array $userIds filtered users
+ */
+ public function filterShareReadyUsers( $unfilteredUsers ) {
+
+ // This array will collect the filtered IDs
+ $userIds = array();
+
+ // Loop through users and create array of UIDs that need new keyfiles
+ foreach ( $unfilteredUsers as $user ) {
+
+ $util = new Util( $this->view, $user );
+
+ // Check that the user is encryption capable, or is the
+ // public system user 'ownCloud' (for public shares)
+ if (
+ $util->ready()
+ or $user == 'ownCloud'
+ ) {
+
+ // Construct array of just UIDs for Keymanager{}
+ $userIds[] = $user;
+
+ } else {
+
+ // Log warning; we can't do necessary setup here
+ // because we don't have the user passphrase
+ // TODO: Provide user feedback indicating that
+ // sharing failed
+ \OC_Log::write( 'Encryption library', '"'.$user.'" is not setup for encryption', \OC_Log::WARN );
+
+ }
+
+ }
+
+ return $userIds;
+
+ }
}
--
GitLab
From 2d267501a10642e5c601ca87748b692ca58e4094 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 20 Feb 2013 19:18:00 +0000
Subject: [PATCH 024/304] Development snapshot Added comments Added methods
---
apps/files_encryption/hooks/hooks.php | 54 ++++++--
apps/files_encryption/lib/crypt.php | 102 --------------
apps/files_encryption/lib/keymanager.php | 4 +-
apps/files_encryption/lib/proxy.php | 43 ++++--
apps/files_encryption/lib/util.php | 169 +++++++++++++++++++++--
apps/files_encryption/test/util.php | 4 +-
6 files changed, 240 insertions(+), 136 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 1ebfdb1ae0..6d982b2c3b 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -178,10 +178,34 @@ class Hooks {
$session = new Session();
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
+ $path = $util->fileIdToPath( $params['itemSource'] );
- $path = Util::getFilePath( $params['itemSource'] );
-
- return Crypt::updateKeyfile( $view, $session, $path );
+ $usersSharing = \OCP\Share::getUsersSharingFile( $path, true );
+
+ $allPaths = $util->getPaths( $path );
+
+ $failed = array();
+
+ foreach ( $allPaths as $path ) {
+
+ if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
+
+ $failed[] = $path;
+
+ }
+
+ }
+
+ // If no attempts to set keyfiles failed
+ if ( empty( $failed ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
}
@@ -190,11 +214,13 @@ class Hooks {
*/
public static function postUnshare( $params ) {
- $view = new \OC_FilesystemView( '/' );
- $session = new Session();
- $path = Util::getFilePath( $params['itemSource'] );
-
- return Crypt::updateKeyfile( $view, $session, $path );
+// $view = new \OC_FilesystemView( '/' );
+// $session = new Session();
+// $userId = \OCP\User::getUser();
+// $util = new Util( $view, $userId );
+// $path = $util->fileIdToPath( $params['itemSource'] );
+//
+// return Crypt::updateKeyfile( $view, $util, $session, $userId, $path );
}
@@ -203,11 +229,13 @@ class Hooks {
*/
public static function postUnshareAll( $params ) {
- $view = new \OC_FilesystemView( '/' );
- $session = new Session();
- $path = Util::getFilePath( $params['itemSource'] );
-
- return Crypt::updateKeyfile( $view, $session, $path );
+// $view = new \OC_FilesystemView( '/' );
+// $session = new Session();
+// $userId = \OCP\User::getUser();
+// $util = new Util( $view, $userId );
+// $path = $util->fileIdToPath( $params['itemSource'] );
+//
+// return Crypt::updateKeyfile( $view, $util, $session, $userId, $path );
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 1b0167834e..a677de950a 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -744,106 +744,4 @@ class Crypt {
}
-
- /**
- * @brief Encrypt keyfile to multiple users
- * @param array $users list of users which should be able to access the file
- * @param string $filePath path of the file to be shared
- */
- private static function encKeyfileToMultipleUsers( \OC_FilesystemView $view, Util $util, Session $session, $userId, array $users, $filePath ) {
-
- // Make sure users are capable of sharing
- $filteredUids = $util->filterShareReadyUsers( $users );
-
- // Get public keys for each user, ready for generating sharekeys
- $userPubKeys = Keymanager::getPublicKeys( $view, $filteredUids ); // TODO: check this includes the owner's public key
-
- \OC_FileProxy::$enabled = false;
-
- // Get the current users's private key for decrypting existing keyfile
- $privateKey = $session->getPrivateKey();
-
- // We need to get a decrypted key for the file
- // Determine how to decrypt the keyfile by checking if current user is owner
- if ( $userId == \OC\Files\Filesystem::getOwner( $filePath ) ) {
-
- // If current user is owner, decrypt without using sharekey
-
- } else {
-
- // Current user is resharing a file they don't own
- // Decrypt keyfile using sharekey
-
- }
-
- // get the existing keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $owner, $filePath );
-
- // decrypt the existing keyfile
- $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
-
- trigger_error("PUBKEYS = ". var_export($userPubKeys, 1));
-
- // re-enc keyfile to sharekeys
- $shareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
-
- // save sharekeys
- if ( ! Keymanager::setShareKeys( $view, $filePath, $shareKeys['keys'] ) ) {
-
- trigger_error( "SET Share keys failed" );
-
- }
-
- // Delete existing keyfile
- // Do this last to ensure file is recoverable in case of error
- // Keymanager::deleteFileKey( $view, $userId, $params['fileTarget'] );
-
- \OC_FileProxy::$enabled = true;
-
- return true;
- }
-
- /**
- * @brief update keyfile encryption for given path and all sub folders/files
- * @param path which needs to be updated
- * @return bool success
- */
- public static function updateKeyfile( \OC_FilesystemView $view, Util $util, Session $session, $path ) {
-
- // Make path include 'files' dir for OC_FSV operations
- $fPath = 'files' . $path;
-
- $result = true;
-
- if ( ! $view->is_dir( $fPath ) ) {
-
- $shares = \OCP\Share::getUsersSharingFile( $path, true );
- $result = self::encKeyfileToMultipleUsers( $view, $util, $session, $shares, $path );
-
- } else {
-
- $content = $view->getDirectoryContent( $fPath );
-
- foreach ( $content as $c ) {
-
- $path = substr($c['path'], 5);
-
- if ( $view->is_dir( $fPath ) ) {
-
- $result &= self::updateKeyfile( $path );
-
- } else {
-
- $shares = \OCP\Share::getUsersSharingFile( $path, true );
- $result &= self::encKeyfileToMultipleUsers( $view, $util, $session, $shares, $path );
-
- }
- }
-
- }
-
- return $result;
-
- }
-
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 5f9eea1a0b..ec1fdd1fd5 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -305,8 +305,8 @@ class Keymanager {
/**
* @brief retrieve shareKey for an encrypted file
* @param \OC_FilesystemView $view
- * @param $userId
- * @param $filePath
+ * @param string $userId
+ * @param string $filePath
* @internal param \OCA\Encryption\file $string name
* @return string file key or false
* @note The sharekey returned is encrypted. Decryption
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 3e4178e8a8..9e6a11d9d4 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -169,6 +169,24 @@ class Proxy extends \OC_FileProxy {
* @param string $data Data that has been read from file
*/
public function postFile_get_contents( $path, $data ) {
+
+ // FIXME: $path for shared files is just /uid/files/Shared/filepath
+
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+
+ if ( $util->isSharedPath( $path ) ) {
+
+ $relPath = $util->stripSharedFilePath( $path );
+
+ } else {
+
+ $relPath = $util->stripUserFilesPath( $path );
+
+ }
+
+
// TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
@@ -178,27 +196,34 @@ class Proxy extends \OC_FileProxy {
Crypt::mode() == 'server'
&& Crypt::isCatfile( $data )
) {
- $view = new \OC_FilesystemView( '/' );
+
// TODO use get owner to find correct location of key files for shared files
- $userId = \OCP\USER::getUser();
$session = new Session();
- $util = new Util( $view, $userId );
- $filePath = $util->stripUserFilesPath( $path );
$privateKey = $session->getPrivateKey( $userId );
+ // Get the file owner so we can retrieve its keyfile
+ $fileOwner = \OC\Files\Filesystem::getOwner( $relPath ); //NOTE: This might be false! make sure the path passed to it is right
+ $fileOwner = 'admin'; // FIXME: Manually set the correct UID for now
+
// Get the encrypted keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
+ $encKeyfile = Keymanager::getFileKey( $view, $fileOwner, $relPath );
- // Check if key is shared or not
- if ( \OCP\Share::isSharedFile( $filePath ) ) {
+ trigger_error("\$encKeyfile = ". var_export($encKeyfile, 1));
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
+
+ trigger_error("\$shareKey = ".var_export($shareKey, 1));
- // If key is shared, fetch the user's shareKey
- $shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
+ // Check if key is shared or not
+ if ( $shareKey ) {
\OC_FileProxy::$enabled = false;
// Decrypt keyfile with shareKey
$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ trigger_error("PROXY plainkeyfile = ". var_export($plainKeyfile, 1));
} else {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8ca51c95d7..ac098cd877 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -224,7 +224,7 @@ class Util {
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
- public function findFiles( $directory ) {
+ public function findEncFiles( $directory ) {
// Disable proxy - we don't want files to be decrypted before
// we handle them
@@ -251,7 +251,7 @@ class Util {
// its contents
if ( $this->view->is_dir( $filePath ) ) {
- $this->findFiles( $filePath );
+ $this->findEncFiles( $filePath );
// If the path is a file, determine
// its encryption status
@@ -348,6 +348,38 @@ class Util {
}
+ /**
+ * @brief Format a shared path to be relative to the /user/files/ directory
+ * @note Expects a path like /uid/files/Shared/filepath
+ */
+ public function stripSharedFilePath( $path ) {
+
+ $trimmed = ltrim( $path, '/' );
+ $split = explode( '/', $trimmed );
+ $sliced = array_slice( $split, 3 );
+ $relPath = implode( '/', $sliced );
+
+ return $relPath;
+
+ }
+
+ public function isSharedPath( $path ) {
+
+ $trimmed = ltrim( $path, '/' );
+ $split = explode( '/', $trimmed );
+
+ if ( $split[2] == "Shared" ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
/**
* @brief Encrypt all files in a directory
* @param string $publicKey the public key to encrypt files with
@@ -356,7 +388,7 @@ class Util {
*/
public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
- if ( $found = $this->findFiles( $dirPath ) ) {
+ if ( $found = $this->findEncFiles( $dirPath ) ) {
// Disable proxy to prevent file being encrypted twice
\OC_FileProxy::$enabled = false;
@@ -478,13 +510,18 @@ class Util {
* @param $fileId id of the file
* @return path of the file
*/
- public static function getFilePath($fileId) {
- $query = \OC_DB::prepare('SELECT `path`'
+ public static function fileIdToPath( $fileId ) {
+
+ $query = \OC_DB::prepare( 'SELECT `path`'
.' FROM `*PREFIX*filecache`'
- .' WHERE `fileid` = ?');
- $result = $query->execute(array($fileId));
+ .' WHERE `fileid` = ?' );
+
+ $result = $query->execute( array( $fileId ) );
+
$row = $result->fetchRow();
- return substr($row['path'], 5);
+
+ return substr( $row['path'], 5 );
+
}
/**
@@ -527,5 +564,121 @@ class Util {
return $userIds;
}
+
+ /**
+ * @brief Expand given path to all sub files & folders
+ * @param Session $session
+ * @param string $path path which needs to be updated
+ * @return bool outcome of attempt to set keyfiles
+ */
+ public function getPaths( $path ) {
+
+ // Default return value is success
+ $result = true;
+
+ // Make path include 'files' dir for OC_FSV operations
+ $fPath = 'files' . $path;
+
+ // If we're handling a single file
+ if ( ! $this->view->is_dir( $fPath ) ) {
+
+ $pathsArray[] = $path;
+
+ // If we're handling a folder (recursively)
+ } else {
+
+ $subFiles = $this->view->getDirectoryContent( $fPath );
+
+ foreach ( $subFiles as $file ) {
+
+ $filePath = substr( $file['path'], 5 );
+
+ // If this is a nested file
+ if ( ! $this->view->is_dir( $fPath ) ) {
+
+ // Add the file path to array
+ $pathsArray[] = $path;
+
+ } else {
+
+ // If this is a nested folder
+ $dirPaths = $this->getPaths( $filePath );
+
+ // Add all subfiles & folders to the array
+ $pathsArray = array_merge( $dirPaths, $pathsArray );
+
+ }
+ }
+
+ }
+
+ return $pathsArray;
+
+ }
+
+ /**
+ * @brief Encrypt keyfile to multiple users
+ * @param array $users list of users which should be able to access the file
+ * @param string $filePath path of the file to be shared
+ */
+ public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
+
+ // Make sure users are capable of sharing
+ $filteredUids = $this->filterShareReadyUsers( $users );
+
+ // Get public keys for each user, ready for generating sharekeys
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids ); // TODO: check this includes the owner's public key
+
+ \OC_FileProxy::$enabled = false;
+
+ // Get the current users's private key for decrypting existing keyfile
+ $privateKey = $session->getPrivateKey();
+
+ $fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
+
+ // Get the encrypted keyfile
+ // NOTE: the keyfile format depends on how it was encrypted! At
+ // this stage we don't know how it was encrypted
+ $encKeyfile = Keymanager::getFileKey( $this->view, $this->userId, $filePath );
+
+ // We need to decrypt the keyfile
+ // Has the file been shared yet?
+ if (
+ $this->userId == $fileOwner
+ && ! Keymanager::getShareKey( $this->view, $this->userId, $filePath ) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+ ) {
+
+ // The file has no shareKey, and its keyfile must be
+ // decrypted conventionally
+ $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
+
+
+ } else {
+
+ // The file has a shareKey and must use it for decryption
+ $shareKey = Keymanager::getShareKey( $this->view, $this->userId, $filePath );
+
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ }
+
+ // Re-enc keyfile to (additional) sharekeys
+ $newShareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+
+ // Save new sharekeys to all necessary user folders
+ if ( ! Keymanager::setShareKeys( $this->view, $filePath, $newShareKeys['keys'] ) ) {
+
+ trigger_error( "SET Share keys failed" );
+
+ }
+
+ // Delete existing keyfile
+ // Do this last to ensure file is recoverable in case of error
+ // Keymanager::deleteFileKey( $this->view, $this->userId, $params['fileTarget'] );
+
+ \OC_FileProxy::$enabled = true;
+
+ return true;
+ }
}
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
index 1cdeff8008..275e60f4bd 100755
--- a/apps/files_encryption/test/util.php
+++ b/apps/files_encryption/test/util.php
@@ -150,13 +150,13 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
}
- function testFindFiles() {
+ function testFindEncFiles() {
// $this->view->chroot( "/data/{$this->userId}/files" );
$util = new Encryption\Util( $this->view, $this->userId );
- $files = $util->findFiles( '/', 'encrypted' );
+ $files = $util->findEncFiles( '/', 'encrypted' );
var_dump( $files );
--
GitLab
From 40efeb91878e72eb5c2eb1ab50574cda9435e0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 22 Feb 2013 16:02:27 +0100
Subject: [PATCH 025/304] isSharedFile() doesn't detect all shares, just use
getUsersSharingFile() directly either you get a list of users or not
---
apps/files_encryption/lib/proxy.php | 6 +----
lib/public/share.php | 34 -----------------------------
2 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 9e6a11d9d4..ebe09dc075 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -113,14 +113,10 @@ class Proxy extends \OC_FileProxy {
$encData = Crypt::symmetricEncryptFileContentKeyfile( $data );
// Check if the keyfile needs to be shared
- if ( \OCP\Share::isSharedFile( $filePath ) ) {
+ if ( ($userIds = \OCP\Share::getUsersSharingFile( $filePath, true )) ) {
// $fileOwner = \OC\Files\Filesystem::getOwner( $path );
- // List everyone sharing the file
- //TODO check, is this path always the path to the source file?
- $userIds = \OCP\Share::getUsersSharingFile( $filePath, true );
-
$publicKeys = Keymanager::getPublicKeys( $rootView, $userIds );
\OC_FileProxy::$enabled = false;
diff --git a/lib/public/share.php b/lib/public/share.php
index 720337c3c3..7630c8ae6c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -108,41 +108,7 @@ class Share {
return $path;
}
-
- public static function isSharedFile( $path ) {
-
- $fPath = self::prepFileTarget( $path );
-
- // Fetch all shares of this file path from DB
- $query = \OC_DB::prepare(
- 'SELECT
- id
- FROM
- `*PREFIX*share`
- WHERE
- file_target = ?'
- );
-
- $result = $query->execute( array( $fPath ) );
-
- if ( \OC_DB::isError( $result ) ) {
-
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage( $result ) . ', path=' . $fPath, \OC_Log::ERROR );
-
- }
-
- if ( $result->fetchRow() !== false ) {
- return true;
-
- } else {
-
- return false;
-
- }
-
- }
-
/**
* @brief Find which users can access a shared item
* @param $path to the file
--
GitLab
From 31c434b79560c3c45e6202cecc635ad6cb887390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 22 Feb 2013 16:08:08 +0100
Subject: [PATCH 026/304] the default should be to encrypt all files if the
user/admin doesn't specify a blacklist explicitely
---
apps/files_encryption/lib/proxy.php | 2 +-
apps/files_encryption/settings-personal.php | 2 +-
apps/files_encryption/settings.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ebe09dc075..56c9000bfb 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -70,7 +70,7 @@ class Proxy extends \OC_FileProxy {
if ( is_null(self::$blackList ) ) {
- self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+ self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
}
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 6fe4ea6d56..94e37ebe96 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -8,7 +8,7 @@
$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
$tmpl->assign( 'blacklist', $blackList );
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index d1260f44e9..85c616bca7 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -10,7 +10,7 @@
$tmpl = new OCP\Template( 'files_encryption', 'settings' );
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
$tmpl->assign( 'blacklist', $blackList );
$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
--
GitLab
From ca1b94d890c281507c31082f1116f15d246341dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 25 Feb 2013 12:29:07 +0100
Subject: [PATCH 027/304] make sure that home folders are mounted correctly
before write/read keyfile
---
apps/files_encryption/lib/keymanager.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index ec1fdd1fd5..d35ad8f4d5 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -105,6 +105,7 @@ class Keymanager {
*/
public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+ \OC\Files\Filesystem::initMountPoints($userId);
$basePath = '/' . $userId . '/files_encryption/keyfiles';
$targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
@@ -134,6 +135,7 @@ class Keymanager {
*/
public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+ \OC\Files\Filesystem::initMountPoints($userId);
$filePath_f = ltrim( $filePath, '/' );
$keyfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
--
GitLab
From 4550ae6a69c00aeab2f54d0210ae5dee90f7ee82 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 26 Feb 2013 18:11:29 +0000
Subject: [PATCH 028/304] Shared encrypted files now readable by both sharer
and sharee
---
apps/files_encryption/lib/crypt.php | 2 ++
apps/files_encryption/lib/keymanager.php | 20 ++++++++++---
apps/files_encryption/lib/proxy.php | 15 ++++++----
apps/files_encryption/lib/util.php | 37 +++++++++++++++++-------
4 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index a677de950a..5a2d99df54 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -391,6 +391,8 @@ class Crypt {
if( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {
+// trigger_error("SEALED = $sealed");
+
$i = 0;
// Ensure each shareKey is labelled with its
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index d35ad8f4d5..ec4057d098 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -105,6 +105,8 @@ class Keymanager {
*/
public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+ \OC_FileProxy::$enabled = false;
+
\OC\Files\Filesystem::initMountPoints($userId);
$basePath = '/' . $userId . '/files_encryption/keyfiles';
@@ -112,15 +114,19 @@ class Keymanager {
if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-
+ // FIXME: write me
} else {
// Save the keyfile in parallel directory
- return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+ $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
}
+ \OC_FileProxy::$enabled = true;
+
+ return $result;
+
}
/**
@@ -140,16 +146,22 @@ class Keymanager {
$keyfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ \OC_FileProxy::$enabled = false;
+
if ( $view->file_exists( $keyfilePath ) ) {
- return $view->file_get_contents( $keyfilePath );
+ $result = $view->file_get_contents( $keyfilePath );
} else {
- return false;
+ $result = false;
}
+ \OC_FileProxy::$enabled = true;
+
+ return $result;
+
}
/**
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 56c9000bfb..29207dce07 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -91,7 +91,8 @@ class Proxy extends \OC_FileProxy {
return false;
}
- public function preFile_put_contents( $path, &$data ) {
+ public function preFile_put_contents( $path, &$data ) {
+
// TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
if ( self::shouldEncrypt( $path ) ) {
@@ -204,22 +205,22 @@ class Proxy extends \OC_FileProxy {
// Get the encrypted keyfile
$encKeyfile = Keymanager::getFileKey( $view, $fileOwner, $relPath );
- trigger_error("\$encKeyfile = ". var_export($encKeyfile, 1));
-
// Attempt to fetch the user's shareKey
$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
- trigger_error("\$shareKey = ".var_export($shareKey, 1));
-
// Check if key is shared or not
if ( $shareKey ) {
\OC_FileProxy::$enabled = false;
+// trigger_error("\$encKeyfile = $encKeyfile, \$shareKey = $shareKey, \$privateKey = $privateKey");
+
// Decrypt keyfile with shareKey
$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
- trigger_error("PROXY plainkeyfile = ". var_export($plainKeyfile, 1));
+// $plainKeyfile = $encKeyfile;
+
+// trigger_error("PROXY plainkeyfile = ". var_export($plainKeyfile, 1));
} else {
@@ -229,6 +230,8 @@ class Proxy extends \OC_FileProxy {
}
$plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
+
+// trigger_error("PLAINDATA = ". var_export($plainData, 1));
} elseif (
Crypt::mode() == 'server'
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index ac098cd877..920ff3eb15 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -21,17 +21,28 @@
*
*/
-// Todo:
+# Bugs
+# ----
+# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
+# Deleting files if keyfile is missing fails
+# When encryption app is disabled files become unreadable
+# Timeouts on first login due to encryption of very large files
+# MultiKeyEncrypt() may be failing
+
+
+# Missing features
+# ----------------
+# Unshare a file
+# Re-use existing keyfiles so they don't need version control
+# Make sure user knows if large files weren't encrypted
+# Trashbin support
+
+
+// Old Todo:
// - Crypt/decrypt button in the userinterface
// - Setting if crypto should be on by default
// - Add a setting "Don´t encrypt files larger than xx because of performance
// reasons"
-// - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is
-// encrypted (.encrypted extension)
-// - Don't use a password directly as encryption key. but a key which is
-// stored on the server and encrypted with the user password. -> password
-// change faster
-// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
namespace OCA\Encryption;
@@ -663,10 +674,14 @@ class Util {
}
// Re-enc keyfile to (additional) sharekeys
- $newShareKeys = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
-
- // Save new sharekeys to all necessary user folders
- if ( ! Keymanager::setShareKeys( $this->view, $filePath, $newShareKeys['keys'] ) ) {
+ $multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+
+ // Save the recrypted key to it's owner's keyfiles directory
+ // Save new sharekeys to all necessary user directory
+ if (
+ ! Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
+ || ! Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
+ ) {
trigger_error( "SET Share keys failed" );
--
GitLab
From aae9b0b1bfc95d60bcc7c4a4b85a387a94ac9caa Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 26 Feb 2013 18:33:31 +0000
Subject: [PATCH 029/304] Started work on post unshare hook Development
snapshot
---
apps/files_encryption/hooks/hooks.php | 114 ++++++++++++++++-------
apps/files_encryption/lib/keymanager.php | 24 +++++
apps/files_encryption/lib/util.php | 3 +-
3 files changed, 107 insertions(+), 34 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 6d982b2c3b..bf16a492e3 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -167,44 +167,60 @@ class Hooks {
* @brief get all users with access to the file and encrypt the file key to each of them
*/
public static function postShared( $params ) {
-
- // NOTE: $params is an array with these keys:
+
+ // NOTE: $params has keys:
+ // [itemType] => file
// itemSource -> int, filecache file ID
+ // [parent] =>
+ // [itemTarget] => /13
// shareWith -> string, uid of user being shared to
// fileTarget -> path of file being shared
// uidOwner -> owner of the original file being shared
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [uidOwner] => admin
+ // [permissions] => 17
+ // [fileSource] => 13
+ // [fileTarget] => /test8
+ // [id] => 10
+ // [token] =>
- $view = new \OC_FilesystemView( '/' );
- $session = new Session();
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
- $path = $util->fileIdToPath( $params['itemSource'] );
-
- $usersSharing = \OCP\Share::getUsersSharingFile( $path, true );
-
- $allPaths = $util->getPaths( $path );
+ // TODO: Should other kinds of item be encrypted too?
+ if ( $params['itemType'] === 'file' ) {
- $failed = array();
-
- foreach ( $allPaths as $path ) {
-
- if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session();
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+ $path = $util->fileIdToPath( $params['itemSource'] );
+
+ $usersSharing = \OCP\Share::getUsersSharingFile( $path, true );
+
+ $allPaths = $util->getPaths( $path );
+
+ $failed = array();
- $failed[] = $path;
+ foreach ( $allPaths as $path ) {
+
+ if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
+
+ $failed[] = $path;
+
+ }
}
- }
-
- // If no attempts to set keyfiles failed
- if ( empty( $failed ) ) {
-
- return true;
+ // If no attempts to set keyfiles failed
+ if ( empty( $failed ) ) {
- } else {
-
- return false;
+ return true;
+
+ } else {
+ return false;
+
+ }
+
}
}
@@ -213,15 +229,47 @@ class Hooks {
* @brief
*/
public static function postUnshare( $params ) {
+
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // [itemSource] => 13
+ // [shareType] => 0
+ // [shareWith] => test1
-// $view = new \OC_FilesystemView( '/' );
-// $session = new Session();
-// $userId = \OCP\User::getUser();
-// $util = new Util( $view, $userId );
-// $path = $util->fileIdToPath( $params['itemSource'] );
-//
-// return Crypt::updateKeyfile( $view, $util, $session, $userId, $path );
+ // TODO: Should other kinds of item be encrypted too?
+ if ( $params['itemType'] === 'file' ) {
+
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session();
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+ $path = $util->fileIdToPath( $params['itemSource'] );
+ $allPaths = $util->getPaths( $path );
+
+ foreach ( $allPaths as $path ) {
+
+ if ( ! Keymanager::delShareKey( $view, $userId, $path ) ) {
+
+ $failed[] = $path;
+
+ }
+
+ }
+
+ // If no attempts to set keyfiles failed
+ if ( empty( $failed ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
}
/**
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index ec4057d098..22e2ffa500 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -350,6 +350,30 @@ class Keymanager {
}
+ /**
+ * @brief Delete a single user's shareKey for a single file
+ */
+ public static function delShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ $trimmed = ltrim( $filePath, '/' );
+ $shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $trimmed . '.shareKey';
+
+ // Unlink doesn't tell us if file was deleted (not found returns
+ // true), so we perform our own test
+ if ( $view->file_exists( $shareKeyPath ) ) {
+
+ return $view->unlink( $shareKeyPath );
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 920ff3eb15..02c62e160c 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -580,7 +580,8 @@ class Util {
* @brief Expand given path to all sub files & folders
* @param Session $session
* @param string $path path which needs to be updated
- * @return bool outcome of attempt to set keyfiles
+ * @return array $pathsArray all found file paths
+ * @note Paths of directories excluded, only *file* paths are returned
*/
public function getPaths( $path ) {
--
GitLab
From 14eae441eb77ee53304d8a164deb146bda4020f4 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 27 Feb 2013 15:31:23 +0000
Subject: [PATCH 030/304] Unsharing a single file now works
---
apps/files_encryption/hooks/hooks.php | 4 +++-
apps/files_encryption/lib/keymanager.php | 12 ++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index bf16a492e3..fb3545208d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -245,11 +245,13 @@ class Hooks {
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
+ // If path is a folder, get all children
$allPaths = $util->getPaths( $path );
foreach ( $allPaths as $path ) {
- if ( ! Keymanager::delShareKey( $view, $userId, $path ) ) {
+ // Unshare each child path
+ if ( ! Keymanager::delShareKey( $view, $params['shareWith'], $path ) ) {
$failed[] = $path;
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 22e2ffa500..62bb12bf90 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -355,6 +355,8 @@ class Keymanager {
*/
public static function delShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+ \OC_FileProxy::$enabled = false;
+
$trimmed = ltrim( $filePath, '/' );
$shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $trimmed . '.shareKey';
@@ -362,16 +364,22 @@ class Keymanager {
// true), so we perform our own test
if ( $view->file_exists( $shareKeyPath ) ) {
- return $view->unlink( $shareKeyPath );
+ $result = $view->unlink( $shareKeyPath );
} else {
+ trigger_error("Could not delete shareKey; does not exist: $shareKeyPath");
+
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
- return false;
+ $result = false;
}
+ \OC_FileProxy::$enabled = false;
+
+ return $result;
+
}
/**
--
GitLab
From 69bc42f920324ef02ade5dff6bd52f2ddde113a2 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 27 Feb 2013 16:15:03 +0000
Subject: [PATCH 031/304] Deleting encrypted files with missing
keyfiles/shareKeys now succeeds
---
apps/files_encryption/hooks/hooks.php | 9 ++-------
apps/files_encryption/lib/crypt.php | 2 --
apps/files_encryption/lib/proxy.php | 27 +++++++++++++++++++++------
apps/files_encryption/lib/util.php | 3 ---
4 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index fb3545208d..590ba7b1b9 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -279,13 +279,8 @@ class Hooks {
*/
public static function postUnshareAll( $params ) {
-// $view = new \OC_FilesystemView( '/' );
-// $session = new Session();
-// $userId = \OCP\User::getUser();
-// $util = new Util( $view, $userId );
-// $path = $util->fileIdToPath( $params['itemSource'] );
-//
-// return Crypt::updateKeyfile( $view, $util, $session, $userId, $path );
+ // NOTE: It appears that this is never called for files, so
+ // we may not need to implement it
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 5a2d99df54..a138f5f3cb 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -390,8 +390,6 @@ class Crypt {
$shareKeys = array();
if( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {
-
-// trigger_error("SEALED = $sealed");
$i = 0;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 29207dce07..92a7049936 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -272,23 +272,38 @@ class Proxy extends \OC_FileProxy {
$split = explode( '/', $trimmed );
$sliced = array_slice( $split, 2 );
$relPath = implode( '/', $sliced );
+ $filePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath;
if ( $view->is_dir( $path ) ) {
// Dirs must be handled separately as deleteFileKey
// doesn't handle them
- $view->unlink( $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath );
+ $view->unlink( $filePath );
} else {
- // Delete keyfile so it isn't orphaned
- $result = Keymanager::deleteFileKey( $view, $userId, $relPath );
-
- \OC_FileProxy::$enabled = true;
+ // Delete keyfile & shareKey so it isn't orphaned
+ if (
+ ! (
+ Keymanager::deleteFileKey( $view, $userId, $relPath )
+ && Keymanager::delShareKey( $view, $userId, $relPath )
+ )
+ ) {
+
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "'.$filePath.'"', \OC_Log::ERROR );
+
+
+ }
+
- return $result;
}
+
+ \OC_FileProxy::$enabled = true;
+
+ // If we don't return true then file delete will fail; better
+ // to leave orphaned keyfiles than to disallow file deletion
+ return true;
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 02c62e160c..31ce3a413c 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -24,15 +24,12 @@
# Bugs
# ----
# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# Deleting files if keyfile is missing fails
# When encryption app is disabled files become unreadable
# Timeouts on first login due to encryption of very large files
-# MultiKeyEncrypt() may be failing
# Missing features
# ----------------
-# Unshare a file
# Re-use existing keyfiles so they don't need version control
# Make sure user knows if large files weren't encrypted
# Trashbin support
--
GitLab
From 953319a2c3d85bf0d5eb86511c7466188b5ca45f Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 27 Feb 2013 18:46:44 +0000
Subject: [PATCH 032/304] Made proxy class reuse existing keyfiles not gen new
ones; Added notes about reusing shareKeys
---
apps/files_encryption/lib/keymanager.php | 2 -
apps/files_encryption/lib/proxy.php | 46 +++++++++++++++-------
apps/files_encryption/lib/util.php | 50 ++++++++++++++++--------
3 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 62bb12bf90..0c2db2be32 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -368,8 +368,6 @@ class Keymanager {
} else {
- trigger_error("Could not delete shareKey; does not exist: $shareKeyPath");
-
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
$result = false;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 92a7049936..c5b1c8154c 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -93,16 +93,17 @@ class Proxy extends \OC_FileProxy {
public function preFile_put_contents( $path, &$data ) {
- // TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
if ( self::shouldEncrypt( $path ) ) {
// Stream put contents should have been converted to fopen
if ( !is_resource( $data ) ) {
- // TODO check who is the owner of the file in case of shared folders
$userId = \OCP\USER::getUser();
$rootView = new \OC_FilesystemView( '/' );
$util = new Util( $rootView, $userId );
+ $session = new Session();
+ $fileOwner = \OC\Files\Filesystem::getOwner( $path );
+ $privateKey = $session->getPrivateKey();
$filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
$size = strlen( $data );
@@ -110,45 +111,62 @@ class Proxy extends \OC_FileProxy {
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
+ // Check if there is an existing key we can reuse
+ if ( $encKeyfile = Keymanager::getFileKey( $rootView, $fileOwner, $filePath ) ) {
+
+ $keyPreExists = true;
+
+ // Decrypt the keyfile
+ $plainKey = $util->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
+
+ } else {
+
+ $keyPreExists = false;
+
+ // Make a new key
+ $plainKey = Crypt::generateKey();
+
+ }
+
// Encrypt data
- $encData = Crypt::symmetricEncryptFileContentKeyfile( $data );
+ $encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
// Check if the keyfile needs to be shared
- if ( ($userIds = \OCP\Share::getUsersSharingFile( $filePath, true )) ) {
-
-// $fileOwner = \OC\Files\Filesystem::getOwner( $path );
+ if ( $userIds = \OCP\Share::getUsersSharingFile( $filePath, true ) ) {
$publicKeys = Keymanager::getPublicKeys( $rootView, $userIds );
\OC_FileProxy::$enabled = false;
// Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt( $encData['key'], $publicKeys );
+ $multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
// Save sharekeys to user folders
+ // TODO: openssl_seal generates new shareKeys (envelope keys) each time data is encrypted, but will data still be decryptable using old shareKeys? If so we don't need to replace the old shareKeys here, we only need to set the new ones
Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
// Set encrypted keyfile as common varname
$encKey = $multiEncrypted['encrypted'];
-
-
} else {
$publicKey = Keymanager::getPublicKey( $rootView, $userId );
// Encrypt plain data to a single user
- $encKey = Crypt::keyEncrypt( $encData['key'], $publicKey );
+ $encKey = Crypt::keyEncrypt( $plainKey, $publicKey );
}
- // TODO: Replace userID with ownerId so keyfile is saved centrally
+ // Save the key if its new
+ if ( ! $keyPreExists ) {
- // Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $rootView, $filePath, $userId, $encKey );
+ // Save keyfile for newly encrypted file in parallel directory tree
+ Keymanager::setFileKey( $rootView, $filePath, $fileOwner, $encKey );
+
+ }
// Replace plain content with encrypted content by reference
- $data = $encData['encrypted'];
+ $data = $encData;
// Update the file cache with file info
\OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 31ce3a413c..cd223bd702 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -626,25 +626,15 @@ class Util {
}
/**
- * @brief Encrypt keyfile to multiple users
- * @param array $users list of users which should be able to access the file
- * @param string $filePath path of the file to be shared
+ * @brief Decrypt a keyfile without knowing how it was encrypted
+ * @param string $filePath
+ * @param string $fileOwner
+ * @param string $privateKey
+ * @note Checks whether file was encrypted with openssl_seal or
+ * openssl_encrypt, and decrypts accrdingly
*/
- public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
-
- // Make sure users are capable of sharing
- $filteredUids = $this->filterShareReadyUsers( $users );
-
- // Get public keys for each user, ready for generating sharekeys
- $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids ); // TODO: check this includes the owner's public key
+ public function decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey ) {
- \OC_FileProxy::$enabled = false;
-
- // Get the current users's private key for decrypting existing keyfile
- $privateKey = $session->getPrivateKey();
-
- $fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
-
// Get the encrypted keyfile
// NOTE: the keyfile format depends on how it was encrypted! At
// this stage we don't know how it was encrypted
@@ -671,6 +661,32 @@ class Util {
}
+ return $plainKeyfile;
+
+ }
+
+ /**
+ * @brief Encrypt keyfile to multiple users
+ * @param array $users list of users which should be able to access the file
+ * @param string $filePath path of the file to be shared
+ */
+ public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
+
+ // Make sure users are capable of sharing
+ $filteredUids = $this->filterShareReadyUsers( $users );
+
+ // Get public keys for each user, ready for generating sharekeys
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids ); // TODO: check this includes the owner's public key
+
+ \OC_FileProxy::$enabled = false;
+
+ // Get the current users's private key for decrypting existing keyfile
+ $privateKey = $session->getPrivateKey();
+
+ $fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
+
+ $plainKeyfile = $this->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
+
// Re-enc keyfile to (additional) sharekeys
$multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
--
GitLab
From 0bc7d3bcf833e257fa4b2ae3b74d60bef63218b8 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 27 Feb 2013 18:50:57 +0000
Subject: [PATCH 033/304] Added notes where to reuse old keys instead of
generating new ones
---
apps/files_encryption/lib/stream.php | 1 +
apps/files_encryption/lib/util.php | 1 +
2 files changed, 2 insertions(+)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index d4b993b4c0..f4bd6f1b6b 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -318,6 +318,7 @@ class Stream {
// one), save the newly generated keyfile
if ( ! $this->getKey() ) {
+ // TODO: Reuse the keyfile, it it exists, instead of making a new one
$this->keyfile = Crypt::generateKey();
$this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index cd223bd702..6a18feea7d 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -692,6 +692,7 @@ class Util {
// Save the recrypted key to it's owner's keyfiles directory
// Save new sharekeys to all necessary user directory
+ // TODO: Reuse the keyfile, it it exists, instead of making a new one
if (
! Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
|| ! Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
--
GitLab
From e65e6a12f1270faec377363f02f27ddd7d68b8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 4 Mar 2013 15:33:38 +0100
Subject: [PATCH 034/304] define key size in constructor, otherwise the key
size will depend on the servers openssl conf
---
apps/files_encryption/lib/crypt.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index a138f5f3cb..2be6e3ae5d 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -56,7 +56,7 @@ class Crypt {
*/
public static function createKeypair() {
- $res = openssl_pkey_new();
+ $res = openssl_pkey_new(array('private_key_bits' => 4096));
// Get private key
openssl_pkey_export( $res, $privateKey );
@@ -450,7 +450,7 @@ class Crypt {
* @returns encrypted file
*/
public static function keyEncrypt( $plainContent, $publicKey ) {
-
+
openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
return $encryptedContent;
--
GitLab
From f2b86d0227d080dd4395efaf5fb086b024af0c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 4 Mar 2013 17:58:56 +0100
Subject: [PATCH 035/304] make sure that $this->userId is initialized before
using it as a parameter
---
apps/files_encryption/lib/stream.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index f4bd6f1b6b..6074638ab3 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -68,6 +68,8 @@ class Stream {
private $rootView; // a fsview object set to '/'
public function stream_open( $path, $mode, $options, &$opened_path ) {
+
+ $this->userId = \OCP\User::getUser();
// Get access to filesystem via filesystemview object
if ( !self::$view ) {
@@ -82,9 +84,7 @@ class Stream {
$this->rootView = new \OC_FilesystemView( $this->userId . '/' );
}
-
- $this->userId = \OCP\User::getUser();
-
+
// Get the bare file path
$path = str_replace( 'crypt://', '', $path );
--
GitLab
From c1f1fbda08b464b286e309283ed81d16f30a5ca6 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Sat, 9 Mar 2013 19:18:34 +0100
Subject: [PATCH 036/304] Fixed stream wrapper bugs Switched encryptAll() to
use stream-based instead of file-at-a-time encryption Development snapshot
---
apps/files_encryption/lib/crypt.php | 4 +-
apps/files_encryption/lib/proxy.php | 10 ++--
apps/files_encryption/lib/stream.php | 60 +++++++++------------
apps/files_encryption/lib/util.php | 78 +++++++++++++++++++++++-----
apps/files_encryption/test/crypt.php | 6 +--
5 files changed, 99 insertions(+), 59 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 2be6e3ae5d..f92930c2cb 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -114,7 +114,7 @@ class Crypt {
* @return true / false
* @note see also OCA\Encryption\Util->isEncryptedPath()
*/
- public static function isCatfile( $content ) {
+ public static function isCatfileContent( $content ) {
if ( !$content ) {
@@ -179,7 +179,7 @@ class Crypt {
if (
isset( $metadata['encrypted'] )
and $metadata['encrypted'] === true
- and ! self::isCatfile( $data )
+ and ! self::isCatfileContent( $data )
) {
return true;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index c5b1c8154c..2a738c80e3 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -74,7 +74,7 @@ class Proxy extends \OC_FileProxy {
}
- if ( Crypt::isCatfile( $path ) ) {
+ if ( Crypt::isCatfileContent( $path ) ) {
return true;
@@ -209,7 +209,7 @@ class Proxy extends \OC_FileProxy {
// If data is a catfile
if (
Crypt::mode() == 'server'
- && Crypt::isCatfile( $data )
+ && Crypt::isCatfileContent( $data )
) {
// TODO use get owner to find correct location of key files for shared files
@@ -439,7 +439,7 @@ class Proxy extends \OC_FileProxy {
public function postGetMimeType( $path, $mime ) {
- if ( Crypt::isCatfile( $path ) ) {
+ if ( Crypt::isCatfileContent( $path ) ) {
$mime = \OCP\Files::getMimeType( 'crypt://' . $path, 'w' );
@@ -451,7 +451,7 @@ class Proxy extends \OC_FileProxy {
public function postStat( $path, $data ) {
- if ( Crypt::isCatfile( $path ) ) {
+ if ( Crypt::isCatfileContent( $path ) ) {
$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
@@ -464,7 +464,7 @@ class Proxy extends \OC_FileProxy {
public function postFileSize( $path, $size ) {
- if ( Crypt::isCatfile( $path ) ) {
+ if ( Crypt::isCatfileContent( $path ) ) {
$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 6074638ab3..0b2e6ab3e6 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -68,42 +68,33 @@ class Stream {
private $rootView; // a fsview object set to '/'
public function stream_open( $path, $mode, $options, &$opened_path ) {
-
- $this->userId = \OCP\User::getUser();
- // Get access to filesystem via filesystemview object
- if ( !self::$view ) {
-
- self::$view = new \OC_FilesystemView( $this->userId . '/' );
-
- }
+ $this->userId = \OCP\User::getUser();
- // Set rootview object if necessary
- if ( ! $this->rootView ) {
+ if ( ! isset( $this->rootView ) ) {
- $this->rootView = new \OC_FilesystemView( $this->userId . '/' );
+ $this->rootView = new \OC_FilesystemView( '/' );
}
- // Get the bare file path
- $path = str_replace( 'crypt://', '', $path );
+ // Strip identifier text from path
+ $this->rawPath = str_replace( 'crypt://', '', $path );
- $this->rawPath = $path;
-
- $this->path_f = $this->userId . '/files/' . $path;
+ // Set file path relative to user files dir
+ $this->relPath = $this->userId . '/files/' . $this->rawPath;
if (
- dirname( $path ) == 'streams'
- and isset( self::$sourceStreams[basename( $path )] )
+ dirname( $this->rawPath ) == 'streams'
+ and isset( self::$sourceStreams[basename( $this->rawPath )] )
) {
// Is this just for unit testing purposes?
- $this->handle = self::$sourceStreams[basename( $path )]['stream'];
+ $this->handle = self::$sourceStreams[basename( $this->rawPath )]['stream'];
- $this->path = self::$sourceStreams[basename( $path )]['path'];
+ $this->path = self::$sourceStreams[basename( $this->rawPath )]['path'];
- $this->size = self::$sourceStreams[basename( $path )]['size'];
+ $this->size = self::$sourceStreams[basename( $this->rawPath )]['size'];
} else {
@@ -114,41 +105,38 @@ class Stream {
or $mode == 'wb+'
) {
+ // We're writing a new file so start write counter with 0 bytes
$this->size = 0;
} else {
+ $this->size = $this->rootView->filesize( $this->relPath, $mode );
-
- $this->size = self::$view->filesize( $this->path_f, $mode );
-
- //$this->size = filesize( $path );
+ //$this->size = filesize( $this->rawPath );
}
// Disable fileproxies so we can open the source file without recursive encryption
\OC_FileProxy::$enabled = false;
- //$this->handle = fopen( $path, $mode );
+ //$this->handle = fopen( $this->rawPath, $mode );
- $this->handle = self::$view->fopen( $this->path_f, $mode );
+ $this->handle = $this->rootView->fopen( $this->relPath, $mode );
\OC_FileProxy::$enabled = true;
- if ( !is_resource( $this->handle ) ) {
+ if ( ! is_resource( $this->handle ) ) {
- \OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
+ \OCP\Util::writeLog( 'files_encryption', 'failed to open file "'.$this->rootView . '"', \OCP\Util::ERROR );
+ } else {
+
+ $this->meta = stream_get_meta_data( $this->handle );
+
}
}
- if ( is_resource( $this->handle ) ) {
-
- $this->meta = stream_get_meta_data( $this->handle );
-
- }
-
return is_resource( $this->handle );
}
@@ -238,7 +226,7 @@ class Stream {
// If a keyfile already exists for a file named identically to
// file to be written
- if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
+ if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
// TODO: add error handling for when file exists but no
// keyfile
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6a18feea7d..e8b5be2de1 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -24,13 +24,12 @@
# Bugs
# ----
# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# When encryption app is disabled files become unreadable
# Timeouts on first login due to encryption of very large files
# Missing features
# ----------------
-# Re-use existing keyfiles so they don't need version control
+# Re-use existing keyfiles so they don't need version control (part implemented, stream{} and util{} remain)
# Make sure user knows if large files weren't encrypted
# Trashbin support
@@ -280,14 +279,14 @@ class Util {
// will eat server resources :(
if (
Keymanager::getFileKey( $this->view, $this->userId, $file )
- && Crypt::isCatfile( $data )
+ && Crypt::isCatfileContent( $data )
) {
$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
// If the file uses old
// encryption system
- } elseif ( Crypt::isLegacyEncryptedContent( $this->view->file_get_contents( $filePath ), $relPath ) ) {
+ } elseif ( Crypt::isLegacyEncryptedContent( $this->tail( $filePath, 3 ), $relPath ) ) {
$found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
@@ -324,6 +323,49 @@ class Util {
}
+ /**
+ * @brief Fetch the last lines of a file efficiently
+ * @note Safe to use on large files; does not read entire file to memory
+ * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
+ */
+ public function tail( $filename, $numLines ) {
+
+ \OC_FileProxy::$enabled = false;
+
+ $text = '';
+ $pos = -1;
+ $handle = $this->view->fopen( $filename, 'r' );
+
+ while ( $numLines > 0 ) {
+
+ --$pos;
+
+ if( fseek( $handle, $pos, SEEK_END ) !== 0 ) {
+
+ rewind( $handle );
+ $numLines = 0;
+
+ } elseif ( fgetc( $handle ) === "\n" ) {
+
+ --$numLines;
+
+ }
+
+ $block_size = ( -$pos ) % 8192;
+ if ( $block_size === 0 || $numLines === 0 ) {
+
+ $text = fread( $handle, ( $block_size === 0 ? 8192 : $block_size ) ) . $text;
+
+ }
+ }
+
+ fclose( $handle );
+
+ \OC_FileProxy::$enabled = true;
+
+ return $text;
+ }
+
/**
* @brief Check if a given path identifies an encrypted file
* @return true / false
@@ -338,7 +380,7 @@ class Util {
\OC_FileProxy::$enabled = true;
- return Crypt::isCatfile( $data );
+ return Crypt::isCatfileContent( $data );
}
@@ -403,22 +445,32 @@ class Util {
// Encrypt unencrypted files
foreach ( $found['plain'] as $plainFile ) {
+
+ // Open plain file handle
+
+
+ // Open enc file handle
+
- // Fetch data from file
- $plainData = $this->view->file_get_contents( $plainFile['path'] );
+ // Read plain file in chunks
- // Encrypt data, generate catfile
- $encrypted = Crypt::keyEncryptKeyfile( $plainData, $publicKey );
$relPath = $this->stripUserFilesPath( $plainFile['path'] );
- // Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encrypted['key'] );
+ // Open handle with for binary reading
+ $plainHandle = $this->view->fopen( $plainFile['path'], 'rb' );
+ // Open handle with for binary writing
+ $encHandle = fopen( 'crypt://' . 'var/www/oc6/data/' . $plainFile['path'] . '.tmp', 'ab' );
// Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
+ //$this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
+ $size = stream_copy_to_stream( $plainHandle, $encHandle );
+
+ // Fetch the key that has just been set/updated by the stream
+ $encKey = Keymanager::getFileKey( $relPath );
- $size = strlen( $encrypted['data'] );
+ // Save keyfile
+ Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encKey );
// Add the file to the cache
\OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
index 48ad2ee007..b02e63b2ff 100755
--- a/apps/files_encryption/test/crypt.php
+++ b/apps/files_encryption/test/crypt.php
@@ -416,13 +416,13 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
function testIsEncryptedContent() {
- $this->assertFalse( Encryption\Crypt::isCatfile( $this->dataUrl ) );
+ $this->assertFalse( Encryption\Crypt::isCatfileContent( $this->dataUrl ) );
- $this->assertFalse( Encryption\Crypt::isCatfile( $this->legacyEncryptedData ) );
+ $this->assertFalse( Encryption\Crypt::isCatfileContent( $this->legacyEncryptedData ) );
$keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
- $this->assertTrue( Encryption\Crypt::isCatfile( $keyfileContent ) );
+ $this->assertTrue( Encryption\Crypt::isCatfileContent( $keyfileContent ) );
}
--
GitLab
From c89fd49870e3bdd66b73ab6d8d64895e870de260 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 19 Mar 2013 19:53:15 +0100
Subject: [PATCH 037/304] Improved folder creation code Created stub method for
checking user pwd recovery preference from db Added pwd recovery column to db
Added comments
---
apps/files_encryption/appinfo/database.xml | 8 +++
apps/files_encryption/hooks/hooks.php | 6 +-
apps/files_encryption/lib/util.php | 68 ++++++++++------------
3 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index d294c35d63..b144b6cb2a 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -18,6 +18,14 @@
<type>text</type>
<notnull>true</notnull>
<length>64</length>
+ <comments>What client-side / server-side configuration is used</comments>
+ </field>
+ <field>
+ <name>recovery</name>
+ <type>boolean</type>
+ <notnull>true</notnull>
+ <default>0</default>
+ <comments>Whether encryption key recovery is enabled</comments>
</field>
</declaration>
</table>
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 590ba7b1b9..8db7539706 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -29,9 +29,6 @@ namespace OCA\Encryption;
class Hooks {
- // TODO: use passphrase for encrypting private key that is separate to
- // the login password
-
/**
* @brief Startup encryption backend upon user login
* @note This method should never be called for users using client side encryption
@@ -196,12 +193,15 @@ class Hooks {
$usersSharing = \OCP\Share::getUsersSharingFile( $path, true );
+ // Recursively expand path to include subfiles
$allPaths = $util->getPaths( $path );
$failed = array();
+ // Loop through all subfiles
foreach ( $allPaths as $path ) {
+ // Attempt to set shareKey
if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
$failed[] = $path;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index e8b5be2de1..a80da73a4b 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -153,45 +153,24 @@ class Util {
*/
public function setupServerSide( $passphrase = null ) {
- // Create user dir
- if( !$this->view->file_exists( $this->userDir ) ) {
+ // Set directories to check / create
+ $setUpDirs = array(
+ $this->userDir
+ , $this->userFilesDir
+ , $this->publicKeyDir
+ , $this->encryptionDir
+ , $this->keyfilesPath
+ , $this->shareKeysPath
+ );
- $this->view->mkdir( $this->userDir );
+ // Check / create all necessary dirs
+ foreach ( $setUpDirs as $dirPath ) {
- }
-
- // Create user files dir
- if( !$this->view->file_exists( $this->userFilesDir ) ) {
-
- $this->view->mkdir( $this->userFilesDir );
-
- }
-
- // Create shared public key directory
- if( !$this->view->file_exists( $this->publicKeyDir ) ) {
-
- $this->view->mkdir( $this->publicKeyDir );
-
- }
-
- // Create encryption app directory
- if( !$this->view->file_exists( $this->encryptionDir ) ) {
-
- $this->view->mkdir( $this->encryptionDir );
-
- }
-
- // Create mirrored keyfile directory
- if( !$this->view->file_exists( $this->keyfilesPath ) ) {
-
- $this->view->mkdir( $this->keyfilesPath );
-
- }
-
- // Create mirrored share env keys directory
- if( !$this->view->file_exists( $this->shareKeysPath ) ) {
-
- $this->view->mkdir( $this->shareKeysPath );
+ if( !$this->view->file_exists( $dirPath ) ) {
+
+ $this->view->mkdir( $dirPath );
+
+ }
}
@@ -223,6 +202,20 @@ class Util {
}
+ public function recoveryEnabled( ) {
+
+ $sql = 'SELECT * FROM `*PREFIX*myusers` WHERE id = ?';
+ $args = array(1);
+
+ $query = \OCP\DB::prepare($sql);
+ $result = $query->execute($args);
+
+ while($row = $result->fetchRow()) {
+ $userName = $row['username'];
+ }
+
+ }
+
/**
* @brief Find all files and their encryption status within a directory
* @param string $directory The path of the parent directory to search
@@ -737,6 +730,7 @@ class Util {
$fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
+ // Decrypt keyfile
$plainKeyfile = $this->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
// Re-enc keyfile to (additional) sharekeys
--
GitLab
From fd4e59b748d2d22e4aea4a7583139b5a4e4b65d7 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 20 Mar 2013 19:26:59 +0100
Subject: [PATCH 038/304] Added method for setting user keyfile recovery
preference Fixed method for checking if keyfile recovery is enabled for a
user Added unit test for above 2 methods Made proxy{} always use sharing Made
proxy{} work regardless of sharing API enabled or not Implemented proxy-based
sharing to admin if user keyfile recovery is enabled
---
apps/files_encryption/hooks/hooks.php | 2 -
apps/files_encryption/lib/keymanager.php | 1 +
apps/files_encryption/lib/proxy.php | 56 +++++++++++------
apps/files_encryption/lib/util.php | 78 +++++++++++++++++++++---
apps/files_encryption/test/util.php | 20 ++++++
5 files changed, 126 insertions(+), 31 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 8db7539706..82e650c417 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -40,7 +40,6 @@ class Hooks {
\OC\Files\Filesystem::init( $params['uid'] . '/' . 'files' . '/' );
$view = new \OC_FilesystemView( '/' );
-
$util = new Util( $view, $params['uid'] );
// Check files_encryption infrastructure is ready for action
@@ -61,7 +60,6 @@ class Hooks {
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
$session = new Session();
-
$session->setPrivateKey( $privateKey, $params['uid'] );
$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 0c2db2be32..6837dcf67b 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -57,6 +57,7 @@ class Keymanager {
return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
\OC_FileProxy::$enabled = true;
+
}
/**
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 2a738c80e3..f469422e22 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -131,32 +131,50 @@ class Proxy extends \OC_FileProxy {
// Encrypt data
$encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
- // Check if the keyfile needs to be shared
- if ( $userIds = \OCP\Share::getUsersSharingFile( $filePath, true ) ) {
-
- $publicKeys = Keymanager::getPublicKeys( $rootView, $userIds );
-
- \OC_FileProxy::$enabled = false;
-
- // Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
-
- // Save sharekeys to user folders
- // TODO: openssl_seal generates new shareKeys (envelope keys) each time data is encrypted, but will data still be decryptable using old shareKeys? If so we don't need to replace the old shareKeys here, we only need to set the new ones
- Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
+ // Check if key recovery is enabled
+ $recoveryEnabled = $util->recoveryEnabled();
+
+ // Make sure that a share key is generated for the owner too
+ $userIds = array( $userId );
+
+ if ( \OCP\Share::isEnabled() ) {
+
+ // Find out who, if anyone, is sharing the file
+ $shareUids = \OCP\Share::getUsersSharingFile( $filePath, true );
- // Set encrypted keyfile as common varname
- $encKey = $multiEncrypted['encrypted'];
+ $userIds = array_merge( $userIds, $shareUids );
- } else {
+ }
- $publicKey = Keymanager::getPublicKey( $rootView, $userId );
+ // If recovery is enabled, add the
+ // Admin UID to list of users to share to
+ if ( $recoveryEnabled ) {
- // Encrypt plain data to a single user
- $encKey = Crypt::keyEncrypt( $plainKey, $publicKey );
+ // FIXME: Create a separate admin user purely for recovery, and create method in util for fetching this id from DB?
+ $adminUid = 'recoveryAdmin';
+ $userIds[] = $adminUid;
+
}
+ // Remove duplicate UIDs
+ $uniqueUserIds = array_unique ( $userIds );
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys( $rootView, $uniqueUserIds );
+
+ \OC_FileProxy::$enabled = false;
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
+
+ // Save sharekeys to user folders
+ // TODO: openssl_seal generates new shareKeys (envelope keys) each time data is encrypted, but will data still be decryptable using old shareKeys? If so we don't need to replace the old shareKeys here, we only need to set the new ones
+ Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
+
+ // Set encrypted keyfile as common varname
+ $encKey = $multiEncrypted['data'];
+
// Save the key if its new
if ( ! $keyPreExists ) {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a80da73a4b..b86e7f421b 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -31,7 +31,12 @@
# ----------------
# Re-use existing keyfiles so they don't need version control (part implemented, stream{} and util{} remain)
# Make sure user knows if large files weren't encrypted
-# Trashbin support
+
+
+# Test
+# ----
+# Test that writing files works when recovery is enabled, and sharing API is disabled
+# Test trashbin support
// Old Todo:
@@ -202,18 +207,71 @@ class Util {
}
- public function recoveryEnabled( ) {
+ /**
+ * @brief Check whether pwd recovery is enabled for a given user
+ * @return bool
+ * @note If records are not being returned, check for a hidden space
+ * at the start of the uid in db
+ */
+ public function recoveryEnabled() {
- $sql = 'SELECT * FROM `*PREFIX*myusers` WHERE id = ?';
- $args = array(1);
-
- $query = \OCP\DB::prepare($sql);
- $result = $query->execute($args);
+ $sql = 'SELECT
+ recovery
+ FROM
+ `*PREFIX*encryption`
+ WHERE
+ uid = ?';
+
+ $args = array( $this->userId );
- while($row = $result->fetchRow()) {
- $userName = $row['username'];
- }
+ $query = \OCP\DB::prepare( $sql );
+
+ $result = $query->execute( $args );
+
+ // Set default in case no records found
+ $recoveryEnabled = 0;
+
+ while( $row = $result->fetchRow() ) {
+
+ $recoveryEnabled = $row['recovery'];
+
+ }
+
+ return $recoveryEnabled;
+
+ }
+ /**
+ * @brief Enable / disable pwd recovery for a given user
+ * @param bool $enabled Whether to enable or disable recovery
+ * @return bool
+ */
+ public function setRecovery( $enabled ) {
+
+ $sql = 'UPDATE
+ *PREFIX*encryption
+ SET
+ recovery = ?
+ WHERE
+ uid = ?';
+
+ // Ensure value is an integer
+ $enabled = intval( $enabled );
+
+ $args = array( $enabled, $this->userId );
+
+ $query = \OCP\DB::prepare( $sql );
+
+ if ( $query->execute( $args ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
}
/**
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
index 275e60f4bd..e2767a2ec3 100755
--- a/apps/files_encryption/test/util.php
+++ b/apps/files_encryption/test/util.php
@@ -164,6 +164,26 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
# then false will be returned. Use strict ordering?
}
+
+ function testRecoveryEnabled() {
+
+ $util = new Encryption\Util( $this->view, $this->userId );
+
+ // Record the value so we can return it to it's original state later
+ $enabled = $util->recoveryEnabled();
+
+ $this->assertTrue( $util->setRecovery( 1 ) );
+
+ $this->assertEquals( 1, $util->recoveryEnabled() );
+
+ $this->assertTrue( $util->setRecovery( 0 ) );
+
+ $this->assertEquals( 0, $util->recoveryEnabled() );
+
+ // Return the setting to it's previous state
+ $this->assertTrue( $util->setRecovery( $enabled ) );
+
+ }
// /**
// * @brief test decryption using legacy blowfish method
--
GitLab
From f10be4ea17b08059103627fb97716672bdff4fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 11:58:54 +0100
Subject: [PATCH 039/304] new file structure for share keys; sub-folder need to
be generated each by one (we don't have a recursive mkdir)
---
apps/files_encryption/lib/keymanager.php | 41 ++++++++++++++++++------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 6837dcf67b..6ef256553d 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -28,6 +28,22 @@ namespace OCA\Encryption;
* @note Where a method requires a view object, it's root must be '/'
*/
class Keymanager {
+
+ /**
+ * @brief get uid of the owners of the file and the path to the file
+ * @param $filename
+ * @return array
+ */
+ public static function getUidAndFilename($filename) {
+ $uid = \OC\Files\Filesystem::getOwner($filename);
+ \OC\Files\Filesystem::initMountPoints($uid);
+ 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);
+ }
/**
* @brief retrieve the ENCRYPTED private key from a user
@@ -264,15 +280,17 @@ class Keymanager {
* asymmetrically encrypt the keyfile before passing it to this method
*/
public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
+
+ list($owner, $filename) = self::getUidAndFilename($path);
+
+ $basePath = '/' . $owner . '/files_encryption/share-keys';
- $basePath = '/' . $userId . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+ $shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
- $writePath = $basePath . '/' . $shareKeyPath . '.shareKey';
+ $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
\OC_FileProxy::$enabled = false;
-
+
$result = $view->file_put_contents( $writePath, $shareKey );
if (
@@ -295,7 +313,7 @@ class Keymanager {
* @return bool
*/
public static function setShareKeys( \OC_FilesystemView $view, $path, array $shareKeys ) {
-
+
// $shareKeys must be an array with the following format:
// [userId] => [encrypted key]
@@ -395,9 +413,14 @@ class Keymanager {
isset( $path_parts['dirname'] )
&& ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
) {
-
- $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
-
+ $sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
+ $dir = '';
+ foreach ($sub_dirs as $sub_dir) {
+ $dir .= '/' . $sub_dir;
+ if (!$view->is_dir($dir)) {
+ $view->mkdir($dir);
+ }
+ }
}
return $targetPath;
--
GitLab
From 5995b6996b113145da65fd0b44cdb498ae6e56a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 12:23:28 +0100
Subject: [PATCH 040/304] always call stripUserFilesPath(), we need to keep the
Shared/ to find the correct owner of the file later
---
apps/files_encryption/lib/proxy.php | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f469422e22..4dc2bfd749 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -202,22 +202,14 @@ class Proxy extends \OC_FileProxy {
* @param string $data Data that has been read from file
*/
public function postFile_get_contents( $path, $data ) {
-
+
// FIXME: $path for shared files is just /uid/files/Shared/filepath
$userId = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' );
$util = new Util( $view, $userId );
- if ( $util->isSharedPath( $path ) ) {
-
- $relPath = $util->stripSharedFilePath( $path );
-
- } else {
-
- $relPath = $util->stripUserFilesPath( $path );
-
- }
+ $relPath = $util->stripUserFilesPath( $path );
// TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
--
GitLab
From 890f0142a25c4f4a2e66738360e4c70d86147a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 12:24:04 +0100
Subject: [PATCH 041/304] get shared keys from new location
---
apps/files_encryption/lib/keymanager.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 6ef256553d..19c9de3ece 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -36,6 +36,7 @@ class Keymanager {
*/
public static function getUidAndFilename($filename) {
$uid = \OC\Files\Filesystem::getOwner($filename);
+
\OC\Files\Filesystem::initMountPoints($uid);
if ( $uid != \OCP\User::getUser() ) {
$info = \OC\Files\Filesystem::getFileInfo($filename);
@@ -348,11 +349,9 @@ class Keymanager {
public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
\OC_FileProxy::$enabled = false;
-
- $filePath_f = ltrim( $filePath, '/' );
-
- $shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $filePath_f . '.shareKey';
-
+ list($owner, $filename) = self::getUidAndFilename($filePath);
+
+ $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
if ( $view->file_exists( $shareKeyPath ) ) {
$result = $view->file_get_contents( $shareKeyPath );
--
GitLab
From a65d741a3fda0a35326e0dee7627a69c00e3d0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 12:39:55 +0100
Subject: [PATCH 042/304] move getUidAndFilename() tu util.php
---
apps/files_encryption/lib/keymanager.php | 26 +++++++-----------------
apps/files_encryption/lib/util.php | 17 ++++++++++++++++
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 19c9de3ece..23c061b8e6 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -28,23 +28,6 @@ namespace OCA\Encryption;
* @note Where a method requires a view object, it's root must be '/'
*/
class Keymanager {
-
- /**
- * @brief get uid of the owners of the file and the path to the file
- * @param $filename
- * @return array
- */
- public static function getUidAndFilename($filename) {
- $uid = \OC\Files\Filesystem::getOwner($filename);
-
- \OC\Files\Filesystem::initMountPoints($uid);
- 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);
- }
/**
* @brief retrieve the ENCRYPTED private key from a user
@@ -282,7 +265,9 @@ class Keymanager {
*/
public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
- list($owner, $filename) = self::getUidAndFilename($path);
+ $util = new Util( $view, $userId );
+
+ list($owner, $filename) = $util->getUidAndFilename($path);
$basePath = '/' . $owner . '/files_encryption/share-keys';
@@ -349,7 +334,10 @@ class Keymanager {
public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
\OC_FileProxy::$enabled = false;
- list($owner, $filename) = self::getUidAndFilename($filePath);
+
+ $util = new Util( $view, $userId );
+
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
$shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
if ( $view->file_exists( $shareKeyPath ) ) {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b86e7f421b..5276dae99a 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -815,4 +815,21 @@ class Util {
return true;
}
+ /**
+ * @brief get uid of the owners of the file and the path to the file
+ * @param $filename
+ * @return array
+ */
+ public function getUidAndFilename($filename) {
+ $uid = \OC\Files\Filesystem::getOwner($filename);
+
+ \OC\Files\Filesystem::initMountPoints($uid);
+ 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);
+ }
+
}
--
GitLab
From 5f233ee8140476d02e1c20325b83362c0d54d237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 12:40:31 +0100
Subject: [PATCH 043/304] get the correct paths and owner to access shared
files
---
apps/files_encryption/lib/proxy.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 4dc2bfd749..7c981d4fc4 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -227,11 +227,10 @@ class Proxy extends \OC_FileProxy {
$privateKey = $session->getPrivateKey( $userId );
// Get the file owner so we can retrieve its keyfile
- $fileOwner = \OC\Files\Filesystem::getOwner( $relPath ); //NOTE: This might be false! make sure the path passed to it is right
- $fileOwner = 'admin'; // FIXME: Manually set the correct UID for now
-
+ list($fileOwner, $ownerPath) = $util->getUidAndFilename($relPath);
+
// Get the encrypted keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $fileOwner, $relPath );
+ $encKeyfile = Keymanager::getFileKey( $view, $fileOwner, $ownerPath );
// Attempt to fetch the user's shareKey
$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
--
GitLab
From b1d620300e0671d5a7f24e994b62be310688d13b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 14:22:18 +0100
Subject: [PATCH 044/304] delete share keys if file gets deleted
---
apps/files_encryption/lib/keymanager.php | 27 +++++++++++++++---------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 23c061b8e6..9022ed2cac 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -362,16 +362,23 @@ class Keymanager {
public static function delShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
\OC_FileProxy::$enabled = false;
-
- $trimmed = ltrim( $filePath, '/' );
- $shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $trimmed . '.shareKey';
-
- // Unlink doesn't tell us if file was deleted (not found returns
- // true), so we perform our own test
- if ( $view->file_exists( $shareKeyPath ) ) {
-
- $result = $view->unlink( $shareKeyPath );
-
+
+ $util = new Util( $view, $userId );
+
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+
+ $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
+
+ $absPath = $view->getLocalFile($shareKeyPath);
+
+ $matches = glob(preg_quote($absPath).'.*.shareKey' );
+
+ if ( $matches ) {
+
+ foreach ( $matches as $ma ) {
+ unlink($ma);
+ }
+
} else {
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
--
GitLab
From 6beeb2466f08dbed95f69761668efa6d27fc4d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 16:17:26 +0100
Subject: [PATCH 045/304] also delete share keys if a different user than the
owner deletes a shared file
---
apps/files_encryption/lib/keymanager.php | 6 +-----
apps/files_encryption/lib/proxy.php | 17 +++++++++++------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9022ed2cac..49c6ffa8a5 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -363,11 +363,7 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
- $util = new Util( $view, $userId );
-
- list($owner, $filename) = $util->getUidAndFilename($filePath);
-
- $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
+ $shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $filePath;
$absPath = $view->getLocalFile($shareKeyPath);
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7c981d4fc4..7c23336b3d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -291,17 +291,22 @@ class Proxy extends \OC_FileProxy {
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView( '/' );
-
+
$userId = \OCP\USER::getUser();
-
+
+ $util = new Util( $view, $userId );
+
// Format path to be relative to user files dir
$trimmed = ltrim( $path, '/' );
$split = explode( '/', $trimmed );
$sliced = array_slice( $split, 2 );
$relPath = implode( '/', $sliced );
- $filePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath;
+
+ list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
+
+ $filePath = $owner . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $ownerPath;
- if ( $view->is_dir( $path ) ) {
+ if ( $view->is_dir( $ownerPath ) ) {
// Dirs must be handled separately as deleteFileKey
// doesn't handle them
@@ -312,8 +317,8 @@ class Proxy extends \OC_FileProxy {
// Delete keyfile & shareKey so it isn't orphaned
if (
! (
- Keymanager::deleteFileKey( $view, $userId, $relPath )
- && Keymanager::delShareKey( $view, $userId, $relPath )
+ Keymanager::deleteFileKey( $view, $owner, $ownerPath )
+ && Keymanager::delShareKey( $view, $owner, $ownerPath )
)
) {
--
GitLab
From 73157133e825ff3d66b83091e2b4ebeec0b83e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 16:22:26 +0100
Subject: [PATCH 046/304] reuse function provided in util.php
---
apps/files_encryption/lib/proxy.php | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7c23336b3d..a904294659 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -297,10 +297,7 @@ class Proxy extends \OC_FileProxy {
$util = new Util( $view, $userId );
// Format path to be relative to user files dir
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 2 );
- $relPath = implode( '/', $sliced );
+ $relPath = $util->stripUserFilesPath($path);
list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
--
GitLab
From e717f7150e703821fc98a30ff80b953b737785e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 26 Mar 2013 16:52:58 +0100
Subject: [PATCH 047/304] check for dir in deleteFileKey() and delShareKey(),
to always handle all share keys and file keys on delete
---
apps/files_encryption/lib/keymanager.php | 56 ++++++++++++++----------
apps/files_encryption/lib/proxy.php | 31 ++++---------
2 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 49c6ffa8a5..cac5ab262d 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -178,21 +178,27 @@ class Keymanager {
public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
$trimmed = ltrim( $path, '/' );
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
-
- // Unlink doesn't tell us if file was deleted (not found returns
- // true), so we perform our own test
- if ( $view->file_exists( $keyPath ) ) {
-
- return $view->unlink( $keyPath );
-
- } else {
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+
+ $result = false;
+
+ if ( $view->is_dir($keyPath) ) {
+
+ $result = $view->unlink($keyPath);
+
+ } else if ( $view->file_exists( $keyPath.'.key' ) ) {
+
+ $result = $view->unlink( $keyPath.'.key' );
+
+ }
+
+ if ( !$result ) {
\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
-
- return false;
-
+
}
+
+ return $result;
}
@@ -365,22 +371,28 @@ class Keymanager {
$shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $filePath;
- $absPath = $view->getLocalFile($shareKeyPath);
+ $result = false;
- $matches = glob(preg_quote($absPath).'.*.shareKey' );
+ if ( $view->is_dir($shareKeyPath) ) {
+ $result = $view->unlink($shareKeyPath);
+ } else {
+ $absPath = $view->getLocalFile($shareKeyPath);
- if ( $matches ) {
+ $matches = glob(preg_quote($absPath).'.*.shareKey' );
+
+ if ( $matches ) {
+
+ foreach ( $matches as $ma ) {
+ unlink($ma);
+ }
- foreach ( $matches as $ma ) {
- unlink($ma);
}
- } else {
-
+ $result = true;
+ }
+
+ if ( !result ) {
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
-
- $result = false;
-
}
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index a904294659..a1eb76666d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -302,30 +302,17 @@ class Proxy extends \OC_FileProxy {
list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
$filePath = $owner . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $ownerPath;
+
+ // Delete keyfile & shareKey so it isn't orphaned
+ if (
+ ! (
+ Keymanager::deleteFileKey( $view, $owner, $ownerPath )
+ && Keymanager::delShareKey( $view, $owner, $ownerPath )
+ )
+ ) {
- if ( $view->is_dir( $ownerPath ) ) {
-
- // Dirs must be handled separately as deleteFileKey
- // doesn't handle them
- $view->unlink( $filePath );
-
- } else {
-
- // Delete keyfile & shareKey so it isn't orphaned
- if (
- ! (
- Keymanager::deleteFileKey( $view, $owner, $ownerPath )
- && Keymanager::delShareKey( $view, $owner, $ownerPath )
- )
- ) {
-
- \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "'.$filePath.'"', \OC_Log::ERROR );
-
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "'.$filePath.'"', \OC_Log::ERROR );
- }
-
-
-
}
\OC_FileProxy::$enabled = true;
--
GitLab
From 9ecfd07f23e7fe2924bee6103792c00c6ec3cb0a Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 28 Mar 2013 18:29:18 +0100
Subject: [PATCH 048/304] Added ajax scripts for setting pwd recovery
preferences
---
apps/files_encryption/ajax/adminrecovery.php | 72 ++++++++++++++++++++
apps/files_encryption/ajax/userrecovery.php | 42 ++++++++++++
2 files changed, 114 insertions(+)
create mode 100644 apps/files_encryption/ajax/adminrecovery.php
create mode 100644 apps/files_encryption/ajax/userrecovery.php
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
new file mode 100644
index 0000000000..f22114f851
--- /dev/null
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -0,0 +1,72 @@
+setValue( $app, $key, $value )
+
+<?php
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::callCheck();
+
+if (
+ isset( $_POST['adminEnableRecovery'] )
+ && $_POST['adminEnableRecovery'] == 1
+ && isset( $_POST['recoveryPassword'] )
+ && ! empty ( $_POST['recoveryPassword'] )
+) {
+
+ // TODO: Let the admin set this themselves
+ $recoveryAdminUid = 'recoveryAdmin';
+
+ // If desired recoveryAdmin UID is already in use
+ if ( ! \OC_User::userExists( $recoveryAdminUid ) ) {
+
+ // Create new recoveryAdmin user
+ \OC_User::createUser( $recoveryAdminUid, $_POST['recoveryPassword'] );
+
+ $doSetup = true;
+
+ } else {
+
+ // Get list of admin users
+ $admins = OC_Group::usersInGroup( 'admin' );
+
+ // If the existing recoveryAdmin UID is an admin
+ if ( in_array( $recoveryAdminUid, $admins ) ) {
+
+ // The desired recoveryAdmi UID pre-exists and can be used
+ $doSetup = true;
+
+ // If the recoveryAdmin UID exists but doesn't have admin rights
+ } else {
+
+ \OCP\JSON::error();
+
+ }
+
+ }
+
+ // If recoveryAdmin has passed other checks
+ if ( $doSetup ) {
+
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $recoveryAdminUid );
+
+ // Ensure recoveryAdmin is ready for encryption (has usable keypair etc.)
+ $util->setupServerSide( $_POST['recoveryPassword'] );
+
+ // Store the UID in the DB
+ OC_Appconfig::setValue( 'encryption', 'recoveryAdminUid', $recoveryAdminUid );
+
+ \OCP\JSON::success();
+
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
new file mode 100644
index 0000000000..56c18f7ad5
--- /dev/null
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -0,0 +1,42 @@
+setValue( $app, $key, $value )
+
+<?php
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::callCheck();
+
+if (
+ isset( $_POST['userEnableRecovery'] )
+) {
+
+ // Ensure preference is an integer
+ $recoveryEnabled = intval( $_POST['userEnableRecovery'] );
+
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+
+ // Save recovery preference to DB
+ $result = $util->setRecovery( $recoveryEnabled );
+
+ if ( $result ) {
+
+ \OCP\JSON::success();
+
+ } else {
+
+ \OCP\JSON::error();
+
+ }
+
+}
\ No newline at end of file
--
GitLab
From 14451bdaf07f88c6ac46092c74b987a360b04547 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Fri, 29 Mar 2013 21:11:29 +0100
Subject: [PATCH 049/304] Development snapshot; Fixed errors from
Hooks::login(); Work on enable/disable recoveryAdmin for lost passwords in
settings page (template, ajax, js); Work on fixing sharing files to users
(still broken);
---
apps/files_encryption/appinfo/spec.txt | 12 +++++
apps/files_encryption/hooks/hooks.php | 5 +-
apps/files_encryption/js/settings.js | 14 +++++
apps/files_encryption/lib/keymanager.php | 4 +-
apps/files_encryption/lib/proxy.php | 2 +-
apps/files_encryption/lib/stream.php | 2 +-
apps/files_encryption/lib/util.php | 56 ++++++++++++++++----
apps/files_encryption/settings.php | 6 +++
apps/files_encryption/templates/settings.php | 19 +++++++
9 files changed, 106 insertions(+), 14 deletions(-)
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index 7a937a9143..bb15864cbb 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -35,6 +35,18 @@ that file must have their sharekeys changed also. The keyfile and catfile
however need only changing in the owners files, as there is only one copy of
these.
+Publicly shared files (public links)
+------------------------------------
+
+Files shared via public links use a separate system user account called 'ownCloud'. All public files are shared to that user's public key, and the private key is used to access the files when the public link is used in browser.
+
+This means that files shared via public links are accessible only to users who know the shared URL, or to admins who know the 'ownCloud' user password.
+
+Lost password recovery
+----------------------
+
+In order to enable users to read their encrypted files in the event of a password loss/reset scenario, administrators can choose to enable a 'recoveryAdmin' account. This is a user that all user files will automatically be shared to of the option is enabled. This allows the recoveryAdmin user to generate new keyfiles for the user. By default the UID of the recoveryAdmin is 'recoveryAdmin'.
+
Notes
-----
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 302671889d..43d3dfb5a6 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -40,7 +40,7 @@ class Hooks {
// Manually initialise Filesystem{} singleton with correct
// fake root path, in order to avoid fatal webdav errors
- \OC\Files\Filesystem::init( $params['uid'] . '/' . 'files' . '/' );
+ \OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
$view = new \OC_FilesystemView( '/' );
@@ -194,7 +194,8 @@ class Hooks {
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
- $usersSharing = \OCP\Share::getUsersSharingFile( $path, true );
+ // Note: this currently doesn't include the owner due to \OC\Files\Filesystem::getOwner()
+ $usersSharing = $util->getUsersSharingFile( $path );
// Recursively expand path to include subfiles
$allPaths = $util->getPaths( $path );
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 0be857bb73..4f367f880d 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -6,12 +6,26 @@
$(document).ready(function(){
+ // Trigger ajax on filetype blacklist change
$('#encryption_blacklist').multiSelect({
oncheck:blackListChange,
onuncheck:blackListChange,
createText:'...'
});
+ // Trigger ajax on recoveryAdmin status change
+ $( 'input:radio[name="adminEnableRecovery"]' ).change(
+ function() {
+ $.post(
+ '../ajax/adminrecovery.php'
+ , $( this ).val()
+ , function( data ) {
+ // TODO: provide user with feedback of outcome
+ }
+ );
+ }
+ );
+
function blackListChange(){
var blackList=$('#encryption_blacklist').val().join(',');
OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 99516949af..9bb062d0fd 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -391,8 +391,10 @@ class Keymanager {
$result = true;
}
- if ( !result ) {
+ if ( ! $result ) {
+
\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
+
}
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index a1eb76666d..d5aa0f74f1 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -140,7 +140,7 @@ class Proxy extends \OC_FileProxy {
if ( \OCP\Share::isEnabled() ) {
// Find out who, if anyone, is sharing the file
- $shareUids = \OCP\Share::getUsersSharingFile( $filePath, true );
+ $shareUids = \OCP\Share::getUsersSharingFile( $filePath, true, true, true );
$userIds = array_merge( $userIds, $shareUids );
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 86439b4864..9d01c2ca6c 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -127,7 +127,7 @@ class Stream {
if ( ! is_resource( $this->handle ) ) {
- \OCP\Util::writeLog( 'files_encryption', 'failed to open file "'.$this->rootView . '"', \OCP\Util::ERROR );
+ \OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->relPath . '"', \OCP\Util::ERROR );
} else {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 5276dae99a..f6386ad84d 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -638,7 +638,7 @@ class Util {
/**
* @brief Filter an array of UIDs to return only ones ready for sharing
* @param array $unfilteredUsers users to be checked for sharing readiness
- * @return array $userIds filtered users
+ * @return multi-dimensional array. keys: ready, unready
*/
public function filterShareReadyUsers( $unfilteredUsers ) {
@@ -649,6 +649,8 @@ class Util {
foreach ( $unfilteredUsers as $user ) {
$util = new Util( $this->view, $user );
+
+ $readyIds = $unreadyIds = array();
// Check that the user is encryption capable, or is the
// public system user 'ownCloud' (for public shares)
@@ -657,22 +659,26 @@ class Util {
or $user == 'ownCloud'
) {
- // Construct array of just UIDs for Keymanager{}
- $userIds[] = $user;
+ // Construct array of ready UIDs for Keymanager{}
+ $readyIds[] = $user;
} else {
-
+
+ // Construct array of unready UIDs for Keymanager{}
+ $unreadyIds[] = $user;
+
// Log warning; we can't do necessary setup here
// because we don't have the user passphrase
- // TODO: Provide user feedback indicating that
- // sharing failed
\OC_Log::write( 'Encryption library', '"'.$user.'" is not setup for encryption', \OC_Log::WARN );
}
}
- return $userIds;
+ return array (
+ 'ready' => $userIds
+ , 'unready' => $unreadyIds
+ );
}
@@ -778,8 +784,18 @@ class Util {
// Make sure users are capable of sharing
$filteredUids = $this->filterShareReadyUsers( $users );
+// trigger_error( print_r($filteredUids, 1) );
+
+ if ( ! empty( $filteredUids['unready'] ) ) {
+
+ // Notify user of unready userDir
+ // TODO: Move this out of here; it belongs somewhere else
+ \OCP\JSON::error();
+
+ }
+
// Get public keys for each user, ready for generating sharekeys
- $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids ); // TODO: check this includes the owner's public key
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] ); // TODO: check this includes the owner's public key
\OC_FileProxy::$enabled = false;
@@ -814,8 +830,30 @@ class Util {
return true;
}
+
+ /**
+ * @brief Returns the users who are sharing a file, including the file owner
+ * @param $path Relative path of the file, like files/file.txt
+ * @return $users array of UIDs
+ * @note This wraps the OCP\Share method, but includes the owner even if
+ * the file isn't registered in sharing API
+ */
+ public function getUsersSharingFile( $path ) {
+
+ $users = \OCP\Share::getUsersSharingFile( $path, true, true );
+
+ // FIXME: this is returning empty :/
+ $owner = \OC\Files\Filesystem::getOwner( $path );
+
+// trigger_error( var_export( $owner, 1));
+
+ $users[] = $owner;
+
+ return array_unique( $users );
+
+ }
- /**
+ /**
* @brief get uid of the owners of the file and the path to the file
* @param $filename
* @return array
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 85c616bca7..71d47f061a 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -12,8 +12,14 @@ $tmpl = new OCP\Template( 'files_encryption', 'settings' );
$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
+// Check if an adminRecovery account is enabled for recovering files after lost pwd
+$view = new OC_FilesystemView( '' );
+$util = new \OCA\Encryption\Util( $view, \OCP\USER::getUser() );
+$recoveryEnabled = $util->recoveryEnabled();
+
$tmpl->assign( 'blacklist', $blackList );
$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
+$tmpl->assign( 'recoveryEnabled', $recoveryEnabled );
\OCP\Util::addscript( 'files_encryption', 'settings' );
\OCP\Util::addscript( 'core', 'multiselect' );
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index b873d7f5aa..6499d0c8e8 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -3,6 +3,7 @@
<p>
<strong><?php p($l->t( 'Encryption' )); ?></strong>
+ <br />
<?php p($l->t( "Exclude the following file types from encryption:" )); ?>
<br />
@@ -16,5 +17,23 @@
<?php endforeach;?>
</select>
</p>
+ <p>
+ <?php p($l->t( "Enable encryption passwords recovery account (allow sharing to recovery account):" )); ?>
+ <br />
+ <input
+ type='radio'
+ name='adminEnableRecovery'
+ value='1'
+ <?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : '' ); ?> />
+ <?php p($l->t( "Enabled" )); ?>
+ <br />
+
+ <input
+ type='radio'
+ name='adminEnableRecovery'
+ value='0'
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : '' ); ?> />
+ <?php p($l->t( "Disabled" )); ?>
+ </p>
</fieldset>
</form>
--
GitLab
From 400cf5beb30de7475520192e840ddb899d0f742e Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 9 Apr 2013 19:11:38 +0200
Subject: [PATCH 050/304] Fixed naming bug of public owncloud key dir, which
caused new keypair to be generated on each pageload
---
apps/files_encryption/lib/session.php | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 171a6900f0..7bfea7bed4 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -27,32 +27,44 @@ namespace OCA\Encryption;
*/
class Session {
+
+ private $view;
/**
* @brief if session is started, check if ownCloud key pair is set up, if not create it
*
* The ownCloud key pair is used to allow public link sharing even if encryption is enabled
*/
- public function __construct() {
+ public function __construct( \OC_FilesystemView $view ) {
+
+ $this->view = $view;
+
+ if ( ! $this->view->is_dir( 'owncloud_private_key' ) ) {
- $view = new \OC\Files\View('/');
- if (!$view->is_dir('owncloud_private_key')) {
- $view->mkdir('owncloud_private_key');
+ $this->view->mkdir('owncloud_private_key');
}
- if (!$view->file_exists("/public-keys/owncloud.public.key") || !$view->file_exists("/owncloud_private_key/owncloud.private.key") ) {
+
+ if (
+ ! $this->view->file_exists("/public-keys/owncloud.public.key")
+ || ! $this->view->file_exists("/owncloud_private_key/owncloud.private.key" )
+ ) {
$keypair = Crypt::createKeypair();
\OC_FileProxy::$enabled = false;
+
// Save public key
- $view->file_put_contents( '/public-keys/ownCloud.public.key', $keypair['publicKey'] );
+ $this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
+
// Encrypt private key empthy passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
+
// Save private key
- $view->file_put_contents( '/owncloud_private_key/ownCloud.private.key', $encryptedPrivateKey );
+ $this->view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
+
}
}
--
GitLab
From 109fe198c3b8ffd5a4f7f4a4aba6639480895644 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 9 Apr 2013 19:19:27 +0200
Subject: [PATCH 051/304] Added info about filesystem method access conventions
---
apps/files_encryption/appinfo/spec.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index bb15864cbb..a1846ca47f 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -47,6 +47,20 @@ Lost password recovery
In order to enable users to read their encrypted files in the event of a password loss/reset scenario, administrators can choose to enable a 'recoveryAdmin' account. This is a user that all user files will automatically be shared to of the option is enabled. This allows the recoveryAdmin user to generate new keyfiles for the user. By default the UID of the recoveryAdmin is 'recoveryAdmin'.
+OC_FilesystemView
+-----------------
+
+files_encryption deals extensively with paths and the filesystem. In order to minimise bugs, it makes calls to filesystem methods in a consistent way: OC_FilesystemView{} objects always use '/' as their root, and specify paths each time particular methods are called. e.g. do this:
+
+$view->file_exists( 'path/to/file' );
+
+Not:
+
+$view->chroot( 'path/to' );
+$view->file_exists( 'file' );
+
+Using this convention means that $view objects are more predictable and less likely to break. Problems with paths are the #1 cause of bugs in this app, and consistent $view handling is an important way to prevent them.
+
Notes
-----
--
GitLab
From 98de385b8adf748bc1f7d9b527b253624575e370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 10 Apr 2013 15:08:28 +0200
Subject: [PATCH 052/304] add $view as parameter for session constructor
---
apps/files_encryption/appinfo/app.php | 4 ++--
apps/files_encryption/hooks/hooks.php | 10 +++++-----
apps/files_encryption/lib/proxy.php | 4 ++--
apps/files_encryption/lib/stream.php | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index b095f79c0c..47f4120fb3 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -24,8 +24,8 @@ OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', '
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-
-$session = new OCA\Encryption\Session();
+$view = new OC\Files\View('/');
+$session = new OCA\Encryption\Session($view);
if (
! $session->getPrivateKey( \OCP\USER::getUser() )
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 43d3dfb5a6..82de80a1cf 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -63,7 +63,7 @@ class Hooks {
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
- $session = new Session();
+ $session = new Session($view);
$session->setPrivateKey( $privateKey, $params['uid'] );
@@ -116,8 +116,8 @@ class Hooks {
// is in use (client-side encryption does not have access to
// the necessary keys)
if ( Crypt::mode() == 'server' ) {
-
- $session = new Session();
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session($view);
// Get existing decrypted private key
$privateKey = $session->getPrivateKey();
@@ -189,7 +189,7 @@ class Hooks {
if ( $params['itemType'] === 'file' ) {
$view = new \OC_FilesystemView( '/' );
- $session = new Session();
+ $session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
@@ -244,7 +244,7 @@ class Hooks {
if ( $params['itemType'] === 'file' ) {
$view = new \OC_FilesystemView( '/' );
- $session = new Session();
+ $session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index d5aa0f74f1..7e18ec9b10 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -101,7 +101,7 @@ class Proxy extends \OC_FileProxy {
$userId = \OCP\USER::getUser();
$rootView = new \OC_FilesystemView( '/' );
$util = new Util( $rootView, $userId );
- $session = new Session();
+ $session = new Session($rootView);
$fileOwner = \OC\Files\Filesystem::getOwner( $path );
$privateKey = $session->getPrivateKey();
$filePath = $util->stripUserFilesPath( $path );
@@ -223,7 +223,7 @@ class Proxy extends \OC_FileProxy {
) {
// TODO use get owner to find correct location of key files for shared files
- $session = new Session();
+ $session = new Session($view);
$privateKey = $session->getPrivateKey( $userId );
// Get the file owner so we can retrieve its keyfile
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 9d01c2ca6c..8bacb98126 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -236,7 +236,7 @@ class Stream {
$this->getUser();
- $session = new Session();
+ $session = new Session($this->rootView);
$privateKey = $session->getPrivateKey( $this->userId );
--
GitLab
From fff979a5907cd3d3ff018e541c50c6bd8c095c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 10 Apr 2013 15:14:44 +0200
Subject: [PATCH 053/304] add $view as parameter for getFileKey() call
---
apps/files_encryption/lib/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f6386ad84d..815f2594ce 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -518,7 +518,7 @@ class Util {
$size = stream_copy_to_stream( $plainHandle, $encHandle );
// Fetch the key that has just been set/updated by the stream
- $encKey = Keymanager::getFileKey( $relPath );
+ $encKey = Keymanager::getFileKey( $this->view, $this->userId, $relPath );
// Save keyfile
Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encKey );
--
GitLab
From 4303d6318ebf04929a74e1b08e3fad82e1be3a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 10 Apr 2013 15:31:19 +0200
Subject: [PATCH 054/304] Session expect OC_FilesystemView()
---
apps/files_encryption/appinfo/app.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 47f4120fb3..9747fb20ad 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -24,7 +24,7 @@ OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', '
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$view = new OC\Files\View('/');
+$view = new OC_FilesystemView('/');
$session = new OCA\Encryption\Session($view);
if (
--
GitLab
From c3a284569b5a6f83104cf3b5f0a52b2ecfffd8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 10 Apr 2013 16:46:02 +0200
Subject: [PATCH 055/304] make sure that public-keys dir exists
---
apps/files_encryption/lib/session.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 7bfea7bed4..0c6a7131fd 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -38,7 +38,8 @@ class Session {
public function __construct( \OC_FilesystemView $view ) {
$this->view = $view;
-
+
+
if ( ! $this->view->is_dir( 'owncloud_private_key' ) ) {
$this->view->mkdir('owncloud_private_key');
@@ -55,6 +56,11 @@ class Session {
\OC_FileProxy::$enabled = false;
// Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
$this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
// Encrypt private key empthy passphrase
--
GitLab
From 8f0bbdc5cbd17d8fdaa773a5a3558b7af7f0a734 Mon Sep 17 00:00:00 2001
From: Florin Peter <fp@datawerk.de>
Date: Thu, 11 Apr 2013 22:55:48 +0200
Subject: [PATCH 056/304] fix performance issues
---
apps/files_encryption/lib/stream.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 8bacb98126..dcc12c9f9e 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -224,6 +224,11 @@ class Stream {
*/
public function getKey() {
+ // fix performance issues
+ if(isset($this->keyfile) && isset($this->encKeyfile)) {
+ return true;
+ }
+
// If a keyfile already exists for a file named identically to
// file to be written
if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
--
GitLab
From f87229ddafff57980bfc93f52d6aff3427e9a0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 12 Apr 2013 14:13:38 +0200
Subject: [PATCH 057/304] fix stream wrapper to make initial encryption work
---
apps/files_encryption/lib/keymanager.php | 18 ++++++++++--------
apps/files_encryption/lib/stream.php | 19 ++++++++++---------
apps/files_encryption/lib/util.php | 11 +++++++----
3 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9bb062d0fd..3e26e6bb69 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -113,17 +113,19 @@ class Keymanager {
$targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
- if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-
- // FIXME: write me
-
- } else {
+ if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
- // Save the keyfile in parallel directory
- $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
+ // create all parent folders
+ $info=pathinfo($basePath . '/' . $targetPath);
+ $keyfileFolderName=$view->getLocalFolder($info['dirname']);
+ if(!file_exists($keyfileFolderName)) {
+ mkdir($keyfileFolderName, 0750, true);
+ }
}
+ $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+
+
\OC_FileProxy::$enabled = true;
return $result;
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 8bacb98126..3bad43de2e 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -52,7 +52,7 @@ class Stream {
// TODO: make all below properties private again once unit testing is
// configured correctly
public $rawPath; // The raw path received by stream_open
- public $path_f; // The raw path formatted to include username and data dir
+ public $relPath; // rel path to users file dir
private $userId;
private $handle; // Resource returned by fopen
private $path;
@@ -80,8 +80,9 @@ class Stream {
// Strip identifier text from path
$this->rawPath = str_replace( 'crypt://', '', $path );
- // Set file path relative to user files dir
- $this->relPath = $this->userId . '/files/' . $this->rawPath;
+ // Set file path relative to user files dir (7 = string length of '/files/')
+ $this->relPath = substr($this->rawPath, strlen($this->userId)+7);
+ //$this->relPath = $this->userId . '/files/' . $this->rawPath;
if (
dirname( $this->rawPath ) == 'streams'
@@ -110,7 +111,7 @@ class Stream {
} else {
- $this->size = $this->rootView->filesize( $this->relPath, $mode );
+ $this->size = $this->rootView->filesize( $this->rawPath, $mode );
//$this->size = filesize( $this->rawPath );
@@ -121,13 +122,13 @@ class Stream {
//$this->handle = fopen( $this->rawPath, $mode );
- $this->handle = $this->rootView->fopen( $this->relPath, $mode );
+ $this->handle = $this->rootView->fopen( $this->rawPath, $mode );
\OC_FileProxy::$enabled = true;
if ( ! is_resource( $this->handle ) ) {
- \OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->relPath . '"', \OCP\Util::ERROR );
+ \OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR );
} else {
@@ -226,13 +227,13 @@ class Stream {
// If a keyfile already exists for a file named identically to
// file to be written
- if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
+ if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->relPath . '.key' ) ) {
// TODO: add error handling for when file exists but no
// keyfile
// Fetch existing keyfile
- $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->rawPath );
+ $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
$this->getUser();
@@ -317,7 +318,7 @@ class Stream {
$userId = \OCP\User::getUser();
// Save the new encrypted file key
- Keymanager::setFileKey( $view, $this->rawPath, $userId, $this->encKeyfile );
+ Keymanager::setFileKey( $view, $this->relPath, $userId, $this->encKeyfile );
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 815f2594ce..4605c0f597 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -511,17 +511,20 @@ class Util {
// Open handle with for binary reading
$plainHandle = $this->view->fopen( $plainFile['path'], 'rb' );
// Open handle with for binary writing
- $encHandle = fopen( 'crypt://' . 'var/www/oc6/data/' . $plainFile['path'] . '.tmp', 'ab' );
+
+ $encHandle = fopen( 'crypt://' . $plainFile['path'] . '.tmp', 'wb' );
// Overwrite the existing file with the encrypted one
//$this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
$size = stream_copy_to_stream( $plainHandle, $encHandle );
-
+
+ $this->view->rename($plainFile['path'] . '.tmp', $plainFile['path']);
+
// Fetch the key that has just been set/updated by the stream
- $encKey = Keymanager::getFileKey( $this->view, $this->userId, $relPath );
+ //$encKey = Keymanager::getFileKey( $this->view, $this->userId, $relPath );
// Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encKey );
+ //Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encKey );
// Add the file to the cache
\OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
--
GitLab
From 02d1f86a535410e26d20d860f800ff069a6aa25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 12 Apr 2013 14:30:02 +0200
Subject: [PATCH 058/304] fix some confusion about paths relative to the files
dir and to the data dir
---
apps/files_encryption/lib/stream.php | 11 +++++------
apps/files_encryption/lib/util.php | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 3bad43de2e..d269a56240 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -51,7 +51,7 @@ class Stream {
// TODO: make all below properties private again once unit testing is
// configured correctly
- public $rawPath; // The raw path received by stream_open
+ public $rawPath; // The raw path relative to the data dir
public $relPath; // rel path to users file dir
private $userId;
private $handle; // Resource returned by fopen
@@ -77,12 +77,11 @@ class Stream {
}
- // Strip identifier text from path
- $this->rawPath = str_replace( 'crypt://', '', $path );
+ // Strip identifier text from path, this gives us the path relative to data/<user>/files
+ $this->relPath = str_replace( 'crypt://', '', $path );
- // Set file path relative to user files dir (7 = string length of '/files/')
- $this->relPath = substr($this->rawPath, strlen($this->userId)+7);
- //$this->relPath = $this->userId . '/files/' . $this->rawPath;
+ // rawPath is relative to the data directory
+ $this->rawPath = $this->userId . '/files/' . $this->relPath;
if (
dirname( $this->rawPath ) == 'streams'
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4605c0f597..6e0aeb96e9 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -344,7 +344,7 @@ class Util {
// If the file is not encrypted
} else {
- $found['plain'][] = array( 'name' => $file, 'path' => $filePath );
+ $found['plain'][] = array( 'name' => $file, 'path' => $relPath );
}
--
GitLab
From 854b9207878d9c5cd8f0d972f4b16b618beade3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 12 Apr 2013 15:18:19 +0200
Subject: [PATCH 059/304] fix some more paths
---
apps/files_encryption/lib/util.php | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6e0aeb96e9..420e3398a8 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -505,20 +505,22 @@ class Util {
// Read plain file in chunks
-
- $relPath = $this->stripUserFilesPath( $plainFile['path'] );
-
+ //relative to data/<user>/file
+ $relPath = $plainFile['path'];
+ //relative to /data
+ $rawPath = $this->userId . '/files/' . $plainFile['path'];
+
// Open handle with for binary reading
- $plainHandle = $this->view->fopen( $plainFile['path'], 'rb' );
+ $plainHandle = $this->view->fopen( $rawPath, 'rb' );
// Open handle with for binary writing
- $encHandle = fopen( 'crypt://' . $plainFile['path'] . '.tmp', 'wb' );
+ $encHandle = fopen( 'crypt://' . $relPath . '.tmp', 'wb' );
// Overwrite the existing file with the encrypted one
//$this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
$size = stream_copy_to_stream( $plainHandle, $encHandle );
- $this->view->rename($plainFile['path'] . '.tmp', $plainFile['path']);
+ $this->view->rename($rawPath . '.tmp', $rawPath);
// Fetch the key that has just been set/updated by the stream
//$encKey = Keymanager::getFileKey( $this->view, $this->userId, $relPath );
@@ -545,18 +547,19 @@ class Util {
// Recrypt data, generate catfile
$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase );
- $relPath = $this->stripUserFilesPath( $legacyFile['path'] );
+ $relPath = $legacyFile['path'];
+ $rawPath = $this->userId . '/files/' . $plainFile['path'];
// Save keyfile
Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['key'] );
// Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $legacyFile['path'], $recrypted['data'] );
+ $this->view->file_put_contents( $rawPath, $recrypted['data'] );
$size = strlen( $recrypted['data'] );
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $legacyFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
+ \OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted'=>true, 'size' => $size ), '' );
}
--
GitLab
From f378a7f572e1da4b24280c1fcbf830e026186c83 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 10 Apr 2013 17:37:03 +0200
Subject: [PATCH 060/304] Fixed proxy class handing of read / write files
Various work on other classes
---
apps/files_encryption/ajax/adminrecovery.php | 12 ++--
apps/files_encryption/appinfo/app.php | 6 +-
apps/files_encryption/hooks/hooks.php | 10 +--
apps/files_encryption/js/settings.js | 9 ++-
apps/files_encryption/lib/proxy.php | 49 ++++++--------
apps/files_encryption/lib/stream.php | 2 +-
apps/files_encryption/lib/util.php | 70 ++++++++++++++++----
apps/files_encryption/test/proxy.php | 2 +-
apps/files_encryption/test/util.php | 12 ++++
9 files changed, 114 insertions(+), 58 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index f22114f851..cec0cd4ddd 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -15,6 +15,8 @@ use OCA\Encryption;
\OCP\JSON::checkAppEnabled( 'files_encryption' );
\OCP\JSON::callCheck();
+$return = $doSetup = false;
+
if (
isset( $_POST['adminEnableRecovery'] )
&& $_POST['adminEnableRecovery'] == 1
@@ -47,7 +49,7 @@ if (
// If the recoveryAdmin UID exists but doesn't have admin rights
} else {
- \OCP\JSON::error();
+ $return = false;
}
@@ -63,10 +65,12 @@ if (
$util->setupServerSide( $_POST['recoveryPassword'] );
// Store the UID in the DB
- OC_Appconfig::setValue( 'encryption', 'recoveryAdminUid', $recoveryAdminUid );
+ OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminUid', $recoveryAdminUid );
- \OCP\JSON::success();
+ $return = true;
}
-}
\ No newline at end of file
+}
+
+($return) ? OC_JSON::success() : OC_JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 9747fb20ad..c2de9d0b44 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -24,8 +24,10 @@ OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', '
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$view = new OC_FilesystemView('/');
-$session = new OCA\Encryption\Session($view);
+
+$view = new OC_FilesystemView( '/' );
+
+$session = new OCA\Encryption\Session( $view );
if (
! $session->getPrivateKey( \OCP\USER::getUser() )
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 82de80a1cf..e65f0945f4 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -63,7 +63,7 @@ class Hooks {
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
- $session = new Session($view);
+ $session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
@@ -116,8 +116,8 @@ class Hooks {
// is in use (client-side encryption does not have access to
// the necessary keys)
if ( Crypt::mode() == 'server' ) {
- $view = new \OC_FilesystemView( '/' );
- $session = new Session($view);
+
+ $session = new Session();
// Get existing decrypted private key
$privateKey = $session->getPrivateKey();
@@ -189,7 +189,7 @@ class Hooks {
if ( $params['itemType'] === 'file' ) {
$view = new \OC_FilesystemView( '/' );
- $session = new Session($view);
+ $session = new Session();
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
@@ -244,7 +244,7 @@ class Hooks {
if ( $params['itemType'] === 'file' ) {
$view = new \OC_FilesystemView( '/' );
- $session = new Session($view);
+ $session = new Session();
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 4f367f880d..9a0bebf247 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -16,11 +16,14 @@ $(document).ready(function(){
// Trigger ajax on recoveryAdmin status change
$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
+
+ var foo = $( this ).val();
+
$.post(
- '../ajax/adminrecovery.php'
- , $( this ).val()
+ OC.filePath('files_encryption', 'ajax', 'adminrecovery.php')
+ , { adminEnableRecovery: foo, recoveryPassword: 'password' }
, function( data ) {
- // TODO: provide user with feedback of outcome
+ alert( data );
}
);
}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7e18ec9b10..44a2e1aae5 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -101,7 +101,7 @@ class Proxy extends \OC_FileProxy {
$userId = \OCP\USER::getUser();
$rootView = new \OC_FilesystemView( '/' );
$util = new Util( $rootView, $userId );
- $session = new Session($rootView);
+ $session = new Session( $rootView );
$fileOwner = \OC\Files\Filesystem::getOwner( $path );
$privateKey = $session->getPrivateKey();
$filePath = $util->stripUserFilesPath( $path );
@@ -115,9 +115,16 @@ class Proxy extends \OC_FileProxy {
if ( $encKeyfile = Keymanager::getFileKey( $rootView, $fileOwner, $filePath ) ) {
$keyPreExists = true;
-
+
+ // Fetch shareKey
+ $shareKey = Keymanager::getShareKey( $rootView, $userId, $filePath );
+
// Decrypt the keyfile
- $plainKey = $util->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
+ $plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ trigger_error("\$shareKey = $shareKey");
+
+ trigger_error("\$plainKey = $plainKey");
} else {
@@ -170,6 +177,7 @@ class Proxy extends \OC_FileProxy {
// Save sharekeys to user folders
// TODO: openssl_seal generates new shareKeys (envelope keys) each time data is encrypted, but will data still be decryptable using old shareKeys? If so we don't need to replace the old shareKeys here, we only need to set the new ones
+
Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
// Set encrypted keyfile as common varname
@@ -219,15 +227,18 @@ class Proxy extends \OC_FileProxy {
// If data is a catfile
if (
Crypt::mode() == 'server'
- && Crypt::isCatfileContent( $data )
+ && Crypt::isCatfileContent( $data ) // TODO: Do we really need this check? Can't we assume it is properly encrypted?
) {
- // TODO use get owner to find correct location of key files for shared files
- $session = new Session($view);
+ // TODO: use get owner to find correct location of key files for shared files
+ $session = new Session( $view );
$privateKey = $session->getPrivateKey( $userId );
// Get the file owner so we can retrieve its keyfile
- list($fileOwner, $ownerPath) = $util->getUidAndFilename($relPath);
+// list( $fileOwner, $ownerPath ) = $util->getUidAndFilename( $relPath );
+
+ $fileOwner = \OC\Files\Filesystem::getOwner( $path );
+ $ownerPath = $util->stripUserFilesPath( $path ); // TODO: Don't trust $path, fetch owner path
// Get the encrypted keyfile
$encKeyfile = Keymanager::getFileKey( $view, $fileOwner, $ownerPath );
@@ -235,27 +246,9 @@ class Proxy extends \OC_FileProxy {
// Attempt to fetch the user's shareKey
$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
- // Check if key is shared or not
- if ( $shareKey ) {
-
- \OC_FileProxy::$enabled = false;
-
-// trigger_error("\$encKeyfile = $encKeyfile, \$shareKey = $shareKey, \$privateKey = $privateKey");
-
- // Decrypt keyfile with shareKey
- $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
-
-// $plainKeyfile = $encKeyfile;
-
-// trigger_error("PROXY plainkeyfile = ". var_export($plainKeyfile, 1));
-
- } else {
-
- // If key is unshared, decrypt with user private key
- $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
-
- }
-
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
$plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
// trigger_error("PLAINDATA = ". var_export($plainData, 1));
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index d269a56240..7315245fcc 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -236,7 +236,7 @@ class Stream {
$this->getUser();
- $session = new Session($this->rootView);
+ $session = new Session( $this->rootView );
$privateKey = $session->getPrivateKey( $this->userId );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 420e3398a8..dc4e37150c 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -24,13 +24,17 @@
# Bugs
# ----
# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# Timeouts on first login due to encryption of very large files
+# Sharing files to other users currently broken (due to merge + ongoing implementation of support for lost password recovery)
+# Timeouts on first login due to encryption of very large files (fix in progress, as a result streaming is currently broken)
+# Sharing all files to admin for recovery purposes still in progress
+# Possibly public links are broken (not tested since last merge of master)
+# getOwner() currently returns false in all circumstances, unsure what code is returning this...
# Missing features
# ----------------
-# Re-use existing keyfiles so they don't need version control (part implemented, stream{} and util{} remain)
# Make sure user knows if large files weren't encrypted
+# Support for resharing encrypted files
# Test
@@ -122,7 +126,8 @@ class Util {
$this->userId = $userId;
$this->client = $client;
$this->userDir = '/' . $this->userId;
- $this->userFilesDir = '/' . $this->userId . '/' . 'files';
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
$this->publicKeyDir = '/' . 'public-keys';
$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
@@ -690,7 +695,6 @@ class Util {
/**
* @brief Expand given path to all sub files & folders
- * @param Session $session
* @param string $path path which needs to be updated
* @return array $pathsArray all found file paths
* @note Paths of directories excluded, only *file* paths are returned
@@ -747,6 +751,8 @@ class Util {
* @param string $privateKey
* @note Checks whether file was encrypted with openssl_seal or
* openssl_encrypt, and decrypts accrdingly
+ * @note This was used when 2 types of encryption for keyfiles was used,
+ * but now we've switched to exclusively using openssl_seal()
*/
public function decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey ) {
@@ -861,19 +867,55 @@ class Util {
/**
* @brief get uid of the owners of the file and the path to the file
- * @param $filename
+ * @param $shareFilePath Path of the file to check
+ * @note $shareFilePath must be relative to data/UID/files. Files
+ * relative to /Shared are also acceptable
* @return array
*/
- public function getUidAndFilename($filename) {
- $uid = \OC\Files\Filesystem::getOwner($filename);
-
- \OC\Files\Filesystem::initMountPoints($uid);
- if ( $uid != \OCP\User::getUser() ) {
- $info = \OC\Files\Filesystem::getFileInfo($filename);
- $ownerView = new \OC\Files\View('/'.$uid.'/files');
- $filename = $ownerView->getPath($info['fileid']);
+ public function getUidAndFilename( $shareFilePath ) {
+
+ $fileOwnerUid = \OC\Files\Filesystem::getOwner( $shareFilePath );
+
+ // Check that UID is valid
+ if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
+
+ throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $shareFilePath . '"' );
+
+ }
+
+ // NOTE: Bah, this dependency should be elsewhere
+ \OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
+
+ // If the file owner is the currently logged in user
+ if ( $fileOwnerUid == $this->userId ) {
+
+ // Assume the path supplied is correct
+ $filename = $shareFilePath;
+
+ } else {
+
+ $info = \OC\Files\Filesystem::getFileInfo( $shareFilePath );
+ $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
+
+ // Fetch real file path from DB
+ $filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
+
}
- return array($uid, $filename);
+
+ // Make path relative for use by $view
+ $relpath = $fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename;
+
+ // Check that the filename we're using is working
+ if ( $this->view->file_exists( $relpath ) ) {
+
+ return array ( $fileOwnerUid, $relpath );
+
+ } else {
+
+ throw new \Exception( 'Supplied path could not be resolved "' . $shareFilePath . '"' );
+
+ }
+
}
}
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/test/proxy.php
index 709730f760..5a2d851ff7 100644
--- a/apps/files_encryption/test/proxy.php
+++ b/apps/files_encryption/test/proxy.php
@@ -52,7 +52,7 @@
// $this->userId = 'admin';
// $this->pass = 'admin';
//
-// $this->session = new Encryption\Session();
+// $this->session = new Encryption\Session( $view ); // FIXME: Provide a $view object for use here
//
// $this->session->setPrivateKey(
// '-----BEGIN PRIVATE KEY-----
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
index e2767a2ec3..3ebc484809 100755
--- a/apps/files_encryption/test/util.php
+++ b/apps/files_encryption/test/util.php
@@ -24,6 +24,8 @@ $loader->register();
use \Mockery as m;
use OCA\Encryption;
+\OC_User::login( 'admin', 'admin' );
+
class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function setUp() {
@@ -184,6 +186,16 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$this->assertTrue( $util->setRecovery( $enabled ) );
}
+
+ function testGetUidAndFilename() {
+
+ \OC_User::setUserId( 'admin' );
+
+ $this->util->getUidAndFilename( 'test1.txt' );
+
+
+
+ }
// /**
// * @brief test decryption using legacy blowfish method
--
GitLab
From 770dcbf663c31c912b88b280121b21ec7ea4be8e Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 16 Apr 2013 14:50:20 +0200
Subject: [PATCH 061/304] Fixed stream{} reading of encrypted files
(stream_read())
---
apps/files_encryption/lib/stream.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index ebfd05041b..f765d62201 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -239,13 +239,15 @@ class Stream {
// Fetch existing keyfile
$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
- $this->getUser();
+ $this->setUserProperty();
$session = new Session( $this->rootView );
$privateKey = $session->getPrivateKey( $this->userId );
- $this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey );
+ $shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
+
+ $this->keyfile = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
return true;
@@ -257,7 +259,7 @@ class Stream {
}
- public function getuser() {
+ public function setUserProperty() {
// Only get the user again if it isn't already set
if ( empty( $this->userId ) ) {
--
GitLab
From f89a3604aabbd36f05789db46b6108f0f41f52b1 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 16 Apr 2013 18:29:22 +0200
Subject: [PATCH 062/304] Working on stream{} writing Development snapshot
---
apps/files_encryption/appinfo/spec.txt | 6 +-
apps/files_encryption/lib/keymanager.php | 22 +++++++
apps/files_encryption/lib/proxy.php | 44 ++++---------
apps/files_encryption/lib/stream.php | 83 ++++++++++++++++--------
apps/files_encryption/lib/util.php | 39 +++++++++++
5 files changed, 133 insertions(+), 61 deletions(-)
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index a1846ca47f..4a7b3fc6ad 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -70,4 +70,8 @@ Notes
is handled in the login hook listener. Therefore each time the user logs in
their files are scanned to detect unencrypted and legacy encrypted files, and
they are (re)encrypted as necessary. This may present a performance issue; we
- need to monitor this.
\ No newline at end of file
+ need to monitor this.
+- When files are saved to ownCloud via WebDAV, a .part file extension is used so
+ that the file isn't cached before the upload has been completed. .part files
+ are not compatible with files_encrytion's key management system however, so
+ we have to always sanitise such paths manually before using them.
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 3e26e6bb69..c37680fcbe 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -132,6 +132,28 @@ class Keymanager {
}
+ /**
+ * @brief Remove .path extension from a file path
+ * @param string $path Path that may identify a .part file
+ * @return string File path without .part extension
+ */
+ public static function fixPartialFilePath( $path ) {
+
+ if ( preg_match( '/\.part$/', $path ) ) {
+
+ $newLength = strlen( $path ) - 5;
+ $fPath = substr( $path, 0, $newLength );
+
+ return $fPath;
+
+ } else {
+
+ return $path;
+
+ }
+
+ }
+
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 44a2e1aae5..4efb3d2e49 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -138,34 +138,9 @@ class Proxy extends \OC_FileProxy {
// Encrypt data
$encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
- // Check if key recovery is enabled
- $recoveryEnabled = $util->recoveryEnabled();
+ $sharingEnabled = \OCP\Share::isEnabled();
- // Make sure that a share key is generated for the owner too
- $userIds = array( $userId );
-
- if ( \OCP\Share::isEnabled() ) {
-
- // Find out who, if anyone, is sharing the file
- $shareUids = \OCP\Share::getUsersSharingFile( $filePath, true, true, true );
-
- $userIds = array_merge( $userIds, $shareUids );
-
- }
-
- // If recovery is enabled, add the
- // Admin UID to list of users to share to
- if ( $recoveryEnabled ) {
-
- // FIXME: Create a separate admin user purely for recovery, and create method in util for fetching this id from DB?
- $adminUid = 'recoveryAdmin';
-
- $userIds[] = $adminUid;
-
- }
-
- // Remove duplicate UIDs
- $uniqueUserIds = array_unique ( $userIds );
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath );
// Fetch public keys for all users who will share the file
$publicKeys = Keymanager::getPublicKeys( $rootView, $uniqueUserIds );
@@ -280,6 +255,8 @@ class Proxy extends \OC_FileProxy {
*/
public function preUnlink( $path ) {
+ $path = Keymanager::fixPartialFilePath( $path );
+
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
@@ -290,17 +267,20 @@ class Proxy extends \OC_FileProxy {
$util = new Util( $view, $userId );
// Format path to be relative to user files dir
- $relPath = $util->stripUserFilesPath($path);
+ $relPath = $util->stripUserFilesPath( $path );
+
+// list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
- list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
+ $fileOwner = \OC\Files\Filesystem::getOwner( $path );
+ $ownerPath = $util->stripUserFilesPath( $path ); // TODO: Don't trust $path, fetch owner path
- $filePath = $owner . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $ownerPath;
+ $filePath = $fileOwner . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $ownerPath;
// Delete keyfile & shareKey so it isn't orphaned
if (
! (
- Keymanager::deleteFileKey( $view, $owner, $ownerPath )
- && Keymanager::delShareKey( $view, $owner, $ownerPath )
+ Keymanager::deleteFileKey( $view, $fileOwner, $ownerPath )
+ && Keymanager::delShareKey( $view, $fileOwner, $ownerPath )
)
) {
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index f765d62201..3e854c8df8 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -44,6 +44,9 @@ namespace OCA\Encryption;
* buffer size used internally by PHP. The encryption process makes the input
* data longer, and input is chunked into smaller pieces in order to result in
* a 8192 encrypted block size.
+ * @note When files are deleted via webdav, or when they are updated and the
+ * previous version deleted, this is handled by OC\Files\View, and thus the
+ * encryption proxies are used and keyfiles deleted.
*/
class Stream {
@@ -171,17 +174,21 @@ class Stream {
//
// Get the data from the file handle
$data = fread( $this->handle, 8192 );
+
+ $result = '';
if ( strlen( $data ) ) {
- $this->getKey();
+ if ( ! $this->getKey() ) {
+
+ // Error! We don't have a key to decrypt the file with
+ throw new \Exception( 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream' );
- $result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
+ }
+
+ // Decrypt data
+ $result = Crypt::symmetricDecryptFileContent( $data, $this->plainKey );
- } else {
-
- $result = '';
-
}
// $length = $this->size - $pos;
@@ -224,18 +231,20 @@ class Stream {
*/
public function getKey() {
- // fix performance issues
- if(isset($this->keyfile) && isset($this->encKeyfile)) {
- return true;
- }
-
- // If a keyfile already exists for a file named identically to
- // file to be written
- if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->relPath . '.key' ) ) {
+ // Check if key is already set
+ if ( isset( $this->plainKey ) && isset( $this->encKeyfile ) ) {
+
+ return true;
+
+ }
- // TODO: add error handling for when file exists but no
- // keyfile
+ // Avoid problems with .part file extensions
+ $this->relPath = Keymanager::fixPartialFilePath( $this->relPath );
+
+ // If a keyfile already exists
+ if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->relPath . '.key' ) ) {
+ // Fetch and decrypt keyfile
// Fetch existing keyfile
$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
@@ -247,12 +256,17 @@ class Stream {
$shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
- $this->keyfile = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
+ $this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
+
+ trigger_error( '$this->relPath = '.$this->relPath );
+ trigger_error( '$this->userId = '.$this->userId);
+ trigger_error( '$this->encKeyfile = '.$this->encKeyfile );
+ trigger_error( '$this->plainKey1 = '.var_export($this->plainKey, 1));
return true;
} else {
-
+
return false;
}
@@ -303,7 +317,7 @@ class Stream {
$pointer = ftell( $this->handle );
// Make sure the userId is set
- $this->getuser();
+ $this->setUserProperty();
// TODO: Check if file is shared, if so, use multiKeyEncrypt and
// save shareKeys in necessary user directories
@@ -313,21 +327,34 @@ class Stream {
// one), save the newly generated keyfile
if ( ! $this->getKey() ) {
- // TODO: Reuse the keyfile, it it exists, instead of making a new one
- $this->keyfile = Crypt::generateKey();
+ $util = new Util( $this->rootView, $this->userId );
+
+ $this->plainKey = Crypt::generateKey();
$this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
- $this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath );
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+
+ $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
$view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
// Save the new encrypted file key
- Keymanager::setFileKey( $view, $this->relPath, $userId, $this->encKeyfile );
+ Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+
+// trigger_error( '$this->relPath = '.$this->relPath );
+// trigger_error( '$this->userId = '.$this->userId);
+// trigger_error( '$this->encKeyfile = '.var_export($this->encKeyfiles, 1) );
}
-
+
+// trigger_error( '$this->plainKey2 = '.var_export($this->plainKey, 1));
+
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
if ( $this->writeCache ) {
@@ -355,7 +382,7 @@ class Stream {
//
// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
//
-// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
+// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->plainKey );
//
// $x = substr( $block, 0, $currentPos % 8192 );
//
@@ -396,7 +423,7 @@ class Stream {
// Read the chunk from the start of $data
$chunk = substr( $data, 0, 6126 );
- $encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
+ $encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
@@ -461,7 +488,7 @@ class Stream {
// Set keyfile property for file in question
$this->getKey();
- $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
+ $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->plainKey );
fwrite( $this->handle, $encrypted );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index dc4e37150c..c964bd94df 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -864,7 +864,46 @@ class Util {
return array_unique( $users );
}
+
+ /**
+ * @brief Find, sanitise and format users sharing a file
+ * @note This wraps other methods into a portable bundle
+ */
+ public function getSharingUsersArray( $sharingEnabled, $filePath ) {
+ // Check if key recovery is enabled
+ $recoveryEnabled = $this->recoveryEnabled();
+
+ // Make sure that a share key is generated for the owner too
+ $userIds = array( $this->userId );
+
+ if ( $sharingEnabled ) {
+
+ // Find out who, if anyone, is sharing the file
+ $shareUids = \OCP\Share::getUsersSharingFile( $filePath, true, true, true );
+
+ $userIds = array_merge( $userIds, $shareUids );
+
+ }
+
+ // If recovery is enabled, add the
+ // Admin UID to list of users to share to
+ if ( $recoveryEnabled ) {
+
+ // FIXME: Create a separate admin user purely for recovery, and create method in util for fetching this id from DB?
+ $adminUid = 'recoveryAdmin';
+
+ $userIds[] = $adminUid;
+
+ }
+
+ // Remove duplicate UIDs
+ $uniqueUserIds = array_unique ( $userIds );
+
+ return $uniqueUserIds;
+
+ }
+
/**
* @brief get uid of the owners of the file and the path to the file
* @param $shareFilePath Path of the file to check
--
GitLab
From 6dd8c79461bc5edd723ffb1d561f8ab9251ba02c Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 17 Apr 2013 17:20:37 +0200
Subject: [PATCH 063/304] Development snapshot Working on stream{} write
---
apps/files_encryption/lib/proxy.php | 5 +-
apps/files_encryption/lib/stream.php | 80 +++++++++++++++-------------
apps/files_encryption/lib/util.php | 3 ++
3 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 4efb3d2e49..1e7ac609a4 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -122,9 +122,8 @@ class Proxy extends \OC_FileProxy {
// Decrypt the keyfile
$plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
- trigger_error("\$shareKey = $shareKey");
-
- trigger_error("\$plainKey = $plainKey");
+// trigger_error("\$shareKey = $shareKey");
+// trigger_error("\$plainKey = $plainKey");
} else {
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 3e854c8df8..01eee177cd 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -225,7 +225,7 @@ class Stream {
}
/**
- * @brief Get the keyfile for the current file, generate one if necessary
+ * @brief Fetch the plain encryption key for the file and set it as plainKey property
* @param bool $generate if true, a new key will be generated if none can be found
* @return bool true on key found and set, false on key not found and new key generated and set
*/
@@ -258,10 +258,10 @@ class Stream {
$this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
- trigger_error( '$this->relPath = '.$this->relPath );
- trigger_error( '$this->userId = '.$this->userId);
- trigger_error( '$this->encKeyfile = '.$this->encKeyfile );
- trigger_error( '$this->plainKey1 = '.var_export($this->plainKey, 1));
+// trigger_error( '$this->relPath = '.$this->relPath );
+// trigger_error( '$this->userId = '.$this->userId);
+// trigger_error( '$this->encKeyfile = '.$this->encKeyfile );
+// trigger_error( '$this->plainKey1 = '.var_export($this->plainKey, 1));
return true;
@@ -319,40 +319,44 @@ class Stream {
// Make sure the userId is set
$this->setUserProperty();
- // TODO: Check if file is shared, if so, use multiKeyEncrypt and
- // save shareKeys in necessary user directories
-
// Get / generate the keyfile for the file we're handling
// If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
if ( ! $this->getKey() ) {
- $util = new Util( $this->rootView, $this->userId );
-
$this->plainKey = Crypt::generateKey();
- $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
-
- $sharingEnabled = \OCP\Share::isEnabled();
-
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath );
-
- // Fetch public keys for all users who will share the file
- $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
-
- $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
-
- $view = new \OC_FilesystemView( '/' );
-
- // Save the new encrypted file key
- Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
-
-// trigger_error( '$this->relPath = '.$this->relPath );
-// trigger_error( '$this->userId = '.$this->userId);
-// trigger_error( '$this->encKeyfile = '.var_export($this->encKeyfiles, 1) );
-
}
+ // Fetch user's public key
+ $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+
+ // Check if OC sharing api is enabled
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ $util = new Util( $this->rootView, $this->userId );
+
+ // Get all users sharing the file
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath );
+
+ // Fetch public keys for all sharing users
+ $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+
+ // Encrypt enc key for all sharing users
+ $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
+
+ $view = new \OC_FilesystemView( '/' );
+
+ // Save the new encrypted file key
+ Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
+
+ // Save the sharekeys
+ Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+
+// trigger_error( "\$this->encKeyfiles['data'] = ".$this->encKeyfiles['data'] );
+// trigger_error( '$this->relPath = '.$this->relPath );
+// trigger_error( '$this->userId = '.$this->userId);
+// trigger_error( '$this->encKeyfile = '.var_export($this->encKeyfiles, 1) );
// trigger_error( '$this->plainKey2 = '.var_export($this->plainKey, 1));
// If extra data is left over from the last round, make sure it
@@ -396,7 +400,7 @@ class Stream {
// // While there still remains somed data to be processed & written
while( strlen( $data ) > 0 ) {
-//
+
// // Remaining length for this iteration, not of the
// // entire file (may be greater than 8192 bytes)
// $remainingLength = strlen( $data );
@@ -404,7 +408,7 @@ class Stream {
// // If data remaining to be written is less than the
// // size of 1 6126 byte block
if ( strlen( $data ) < 6126 ) {
-
+
// Set writeCache to contents of $data
// The writeCache will be carried over to the
// next write round, and added to the start of
@@ -425,6 +429,8 @@ class Stream {
$encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
+ trigger_error("\$encrypted = $encrypted");
+
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
@@ -441,7 +447,7 @@ class Stream {
}
}
-
+
$this->size = max( $this->size, $pointer + $length );
return $length;
@@ -493,7 +499,7 @@ class Stream {
fwrite( $this->handle, $encrypted );
$this->writeCache = '';
-
+
}
}
@@ -501,16 +507,16 @@ class Stream {
public function stream_close() {
$this->flush();
-
+
if (
$this->meta['mode']!='r'
and $this->meta['mode']!='rb'
) {
-
+
\OC\Files\Filesystem::putFileInfo( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
}
-
+
return fclose( $this->handle );
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index c964bd94df..2fc7b959ec 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -29,6 +29,9 @@
# Sharing all files to admin for recovery purposes still in progress
# Possibly public links are broken (not tested since last merge of master)
# getOwner() currently returns false in all circumstances, unsure what code is returning this...
+# encryptAll during login mangles paths: /files/files/
+# encryptAll is accessing files via encryption proxy - perhaps proxies should be disabled?
+# Sharekeys appear to not be deleted when their parent file is, and thus get orphaned
# Missing features
--
GitLab
From 2434739d699e2ca4316ea3aece86d7f609ff8e6d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 18 Apr 2013 02:03:03 +0200
Subject: [PATCH 064/304] fix for trashbin
---
apps/files_encryption/lib/proxy.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 1e7ac609a4..3af9dc73d8 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -254,6 +254,11 @@ class Proxy extends \OC_FileProxy {
*/
public function preUnlink( $path ) {
+ // let the trashbin handle this
+ if ( \OCP\App::isEnabled('files_trashbin') ) {
+ return true;
+ }
+
$path = Keymanager::fixPartialFilePath( $path );
// Disable encryption proxy to prevent recursive calls
--
GitLab
From a646a1169f9a17be8d520489ae85c16bbcc7236c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 13:41:21 +0200
Subject: [PATCH 065/304] return filename relative to users file dir and not
relative to data dir
---
apps/files_encryption/lib/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2fc7b959ec..f03b2308b2 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -950,7 +950,7 @@ class Util {
// Check that the filename we're using is working
if ( $this->view->file_exists( $relpath ) ) {
- return array ( $fileOwnerUid, $relpath );
+ return array ( $fileOwnerUid, $filename );
} else {
--
GitLab
From bd3024242f95a0761c0ce2295b39b4e350a6795d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 15:42:28 +0200
Subject: [PATCH 066/304] always save key file, the key doesn't change but the
encrypted keyfile change always the same way like the share-keys change
---
apps/files_encryption/lib/proxy.php | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 1e7ac609a4..4f02c60e10 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -113,8 +113,6 @@ class Proxy extends \OC_FileProxy {
// Check if there is an existing key we can reuse
if ( $encKeyfile = Keymanager::getFileKey( $rootView, $fileOwner, $filePath ) ) {
-
- $keyPreExists = true;
// Fetch shareKey
$shareKey = Keymanager::getShareKey( $rootView, $userId, $filePath );
@@ -127,8 +125,6 @@ class Proxy extends \OC_FileProxy {
} else {
- $keyPreExists = false;
-
// Make a new key
$plainKey = Crypt::generateKey();
@@ -157,14 +153,9 @@ class Proxy extends \OC_FileProxy {
// Set encrypted keyfile as common varname
$encKey = $multiEncrypted['data'];
- // Save the key if its new
- if ( ! $keyPreExists ) {
-
- // Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $rootView, $filePath, $fileOwner, $encKey );
-
- }
-
+ // Save keyfile for newly encrypted file in parallel directory tree
+ Keymanager::setFileKey( $rootView, $filePath, $fileOwner, $encKey );
+
// Replace plain content with encrypted content by reference
$data = $encData;
--
GitLab
From 7892fddcb95d5d4becde224b1d387025b2a5dd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 15:44:57 +0200
Subject: [PATCH 067/304] remove ToDo, every time the file key gets encrypted
new share keys are generated and a new encrypted filekey. We always need to
use the latest share-keys and encrypted keyfiles
---
apps/files_encryption/lib/proxy.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 4f02c60e10..f996a612bf 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -146,7 +146,6 @@ class Proxy extends \OC_FileProxy {
$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
// Save sharekeys to user folders
- // TODO: openssl_seal generates new shareKeys (envelope keys) each time data is encrypted, but will data still be decryptable using old shareKeys? If so we don't need to replace the old shareKeys here, we only need to set the new ones
Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
--
GitLab
From 40905c8941fa707fe358c0f4a5413931b34f8217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 16:34:23 +0200
Subject: [PATCH 068/304] fix file sharing, sharing files works now; moved the
identification of file owner and the owner path in the keymanager functions
so that other functions doesn't have to deal with it
---
apps/files_encryption/lib/keymanager.php | 17 ++++++++++-------
apps/files_encryption/lib/proxy.php | 13 +++----------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index c37680fcbe..52d100055e 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -107,11 +107,13 @@ class Keymanager {
public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
\OC_FileProxy::$enabled = false;
+
+ $util = new Util($view, $userId);
+ list($owner, $filename) = $util->getUidAndFilename($path);
+
+ $basePath = '/' . $owner . '/files_encryption/keyfiles';
- \OC\Files\Filesystem::initMountPoints($userId);
- $basePath = '/' . $userId . '/files_encryption/keyfiles';
-
- $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+ $targetPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
@@ -166,10 +168,11 @@ class Keymanager {
*/
public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
- \OC\Files\Filesystem::initMountPoints($userId);
- $filePath_f = ltrim( $filePath, '/' );
+ $util = new Util($view, $userId);
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $filePath_f = ltrim( $filename, '/' );
- $keyfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f996a612bf..88a8c072ea 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -102,7 +102,6 @@ class Proxy extends \OC_FileProxy {
$rootView = new \OC_FilesystemView( '/' );
$util = new Util( $rootView, $userId );
$session = new Session( $rootView );
- $fileOwner = \OC\Files\Filesystem::getOwner( $path );
$privateKey = $session->getPrivateKey();
$filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
@@ -112,7 +111,7 @@ class Proxy extends \OC_FileProxy {
\OC_FileProxy::$enabled = false;
// Check if there is an existing key we can reuse
- if ( $encKeyfile = Keymanager::getFileKey( $rootView, $fileOwner, $filePath ) ) {
+ if ( $encKeyfile = Keymanager::getFileKey( $rootView, $userId, $filePath ) ) {
// Fetch shareKey
$shareKey = Keymanager::getShareKey( $rootView, $userId, $filePath );
@@ -153,7 +152,7 @@ class Proxy extends \OC_FileProxy {
$encKey = $multiEncrypted['data'];
// Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $rootView, $filePath, $fileOwner, $encKey );
+ Keymanager::setFileKey( $rootView, $filePath, $userId, $encKey );
// Replace plain content with encrypted content by reference
$data = $encData;
@@ -198,14 +197,8 @@ class Proxy extends \OC_FileProxy {
$session = new Session( $view );
$privateKey = $session->getPrivateKey( $userId );
- // Get the file owner so we can retrieve its keyfile
-// list( $fileOwner, $ownerPath ) = $util->getUidAndFilename( $relPath );
-
- $fileOwner = \OC\Files\Filesystem::getOwner( $path );
- $ownerPath = $util->stripUserFilesPath( $path ); // TODO: Don't trust $path, fetch owner path
-
// Get the encrypted keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $fileOwner, $ownerPath );
+ $encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
// Attempt to fetch the user's shareKey
$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
--
GitLab
From 1df36e0c889e9f80f821274f7f5d1e01a7cc01ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 16:37:49 +0200
Subject: [PATCH 069/304] rename $shareFilePath to $path to avoid confusions,
it is not about paths to share files but about general path to files stored
in ownCloud
---
apps/files_encryption/lib/util.php | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f03b2308b2..dbe4acc74e 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -909,19 +909,19 @@ class Util {
/**
* @brief get uid of the owners of the file and the path to the file
- * @param $shareFilePath Path of the file to check
+ * @param $path Path of the file to check
* @note $shareFilePath must be relative to data/UID/files. Files
* relative to /Shared are also acceptable
* @return array
*/
- public function getUidAndFilename( $shareFilePath ) {
-
- $fileOwnerUid = \OC\Files\Filesystem::getOwner( $shareFilePath );
+ public function getUidAndFilename( $path ) {
+
+ $fileOwnerUid = \OC\Files\Filesystem::getOwner( $path );
// Check that UID is valid
if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
- throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $shareFilePath . '"' );
+ throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
}
@@ -932,11 +932,11 @@ class Util {
if ( $fileOwnerUid == $this->userId ) {
// Assume the path supplied is correct
- $filename = $shareFilePath;
+ $filename = $path;
} else {
- $info = \OC\Files\Filesystem::getFileInfo( $shareFilePath );
+ $info = \OC\Files\Filesystem::getFileInfo( $path );
$ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
// Fetch real file path from DB
@@ -954,7 +954,7 @@ class Util {
} else {
- throw new \Exception( 'Supplied path could not be resolved "' . $shareFilePath . '"' );
+ throw new \Exception( 'Supplied path could not be resolved "' . $path . '"' );
}
--
GitLab
From fe58e4b1a6a0f3b63afe74690986493facdad2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 17:46:04 +0200
Subject: [PATCH 070/304] we need to add the owner of the file as parameter in
case someone else like the owner edits the file; if $includeOwner is set than
add owner also if no other recipient was found. This changes enable all user
with write access to the file to edit it and to encrypt it to the right list
of users again
---
lib/public/share.php | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index 876de89257..acdf895c92 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -127,21 +127,21 @@ class Share {
/**
* @brief Find which users can access a shared item
* @param $path to the file
+ * @param $user owner of the file
* @param include owner to the list of users with access to the file
* @return array
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $path, $includeOwner = false, $removeDuplicates = true ) {
+ public static function getUsersSharingFile( $path, $user, $includeOwner = false, $removeDuplicates = true ) {
- $user = \OCP\User::getUser();
$path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
$path = '';
$shares = array();
-
+ $view = new \OC\Files\View('/'.$user.'/files/');
foreach ($path_parts as $p) {
$path .= '/'.$p;
- $meta = \OC\Files\Filesystem::getFileInfo(\OC_Filesystem::normalizePath($path));
+ $meta = $view->getFileInfo(\OC_Filesystem::normalizePath($path));
$source = $meta['fileid'];
// Fetch all shares of this file path from DB
@@ -203,12 +203,9 @@ class Share {
$shares[] = "ownCloud";
}
}
-
- if ( ! empty( $shares ) ) {
- // Include owner in list of users, if requested
- if ( $includeOwner ) {
- $shares[] = $user;
- }
+ // Include owner in list of users, if requested
+ if ( $includeOwner ) {
+ $shares[] = $user;
}
return array_unique($shares);
--
GitLab
From 39c717b24cd4551a78d07256e15b29e52841f49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 17:52:27 +0200
Subject: [PATCH 071/304] some fixes to the keymanager class to identify the
file owner and the owner path correctly.
---
apps/files_encryption/lib/keymanager.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 52d100055e..5c5a6c7ec5 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -108,7 +108,8 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
- $util = new Util($view, $userId);
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($path);
$basePath = '/' . $owner . '/files_encryption/keyfiles';
@@ -168,7 +169,7 @@ class Keymanager {
*/
public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
- $util = new Util($view, $userId);
+ $util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
$filePath_f = ltrim( $filename, '/' );
@@ -298,7 +299,8 @@ class Keymanager {
*/
public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
- $util = new Util( $view, $userId );
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util( $view, \OCP\User::getUser() );
list($owner, $filename) = $util->getUidAndFilename($path);
@@ -368,7 +370,8 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
- $util = new Util( $view, $userId );
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util( $view, \OCP\User::getUser() );
list($owner, $filename) = $util->getUidAndFilename($filePath);
--
GitLab
From 935d0398600df7c0f46f1cf5d5905c423b9c22e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 17:53:59 +0200
Subject: [PATCH 072/304] necessary changes in util.php after the changes in
\OCP\Share::getUsersSharingFile() (fe58e4b1a6a0f3b63afe74690986493facdad2c4)
---
apps/files_encryption/lib/util.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index dbe4acc74e..e4321fdb9d 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -878,12 +878,15 @@ class Util {
$recoveryEnabled = $this->recoveryEnabled();
// Make sure that a share key is generated for the owner too
- $userIds = array( $this->userId );
-
+ list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+
+ //$userIds = array( $this->userId );
+ $userIds = array();
+
if ( $sharingEnabled ) {
// Find out who, if anyone, is sharing the file
- $shareUids = \OCP\Share::getUsersSharingFile( $filePath, true, true, true );
+ $shareUids = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
$userIds = array_merge( $userIds, $shareUids );
--
GitLab
From 5a7a64df08ba0270d282389ff798708367c30e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 20:00:45 +0200
Subject: [PATCH 073/304] Session needs filesystem view as parameter; use
getSharingUsersArray(), this function also adds the owner to the list
---
apps/files_encryption/hooks/hooks.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e65f0945f4..265b90a87a 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -189,13 +189,13 @@ class Hooks {
if ( $params['itemType'] === 'file' ) {
$view = new \OC_FilesystemView( '/' );
- $session = new Session();
+ $session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
-
- // Note: this currently doesn't include the owner due to \OC\Files\Filesystem::getOwner()
- $usersSharing = $util->getUsersSharingFile( $path );
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+ $usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path);
// Recursively expand path to include subfiles
$allPaths = $util->getPaths( $path );
--
GitLab
From 2bd338c49fd15a992ecc8c796cb921af4ee59e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 18 Apr 2013 20:02:27 +0200
Subject: [PATCH 074/304] getUsersSharingFile() no longer needed, use
getSharingUsersArray() instead; fix filterShareReadyUsers() to return the
correct results
---
apps/files_encryption/lib/util.php | 30 +++---------------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index e4321fdb9d..8807de7c2a 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -657,14 +657,12 @@ class Util {
public function filterShareReadyUsers( $unfilteredUsers ) {
// This array will collect the filtered IDs
- $userIds = array();
+ $readyIds = $unreadyIds = array();
// Loop through users and create array of UIDs that need new keyfiles
foreach ( $unfilteredUsers as $user ) {
$util = new Util( $this->view, $user );
-
- $readyIds = $unreadyIds = array();
// Check that the user is encryption capable, or is the
// public system user 'ownCloud' (for public shares)
@@ -690,7 +688,7 @@ class Util {
}
return array (
- 'ready' => $userIds
+ 'ready' => $readyIds
, 'unready' => $unreadyIds
);
@@ -810,7 +808,7 @@ class Util {
}
// Get public keys for each user, ready for generating sharekeys
- $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] ); // TODO: check this includes the owner's public key
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
\OC_FileProxy::$enabled = false;
@@ -846,28 +844,6 @@ class Util {
return true;
}
- /**
- * @brief Returns the users who are sharing a file, including the file owner
- * @param $path Relative path of the file, like files/file.txt
- * @return $users array of UIDs
- * @note This wraps the OCP\Share method, but includes the owner even if
- * the file isn't registered in sharing API
- */
- public function getUsersSharingFile( $path ) {
-
- $users = \OCP\Share::getUsersSharingFile( $path, true, true );
-
- // FIXME: this is returning empty :/
- $owner = \OC\Files\Filesystem::getOwner( $path );
-
-// trigger_error( var_export( $owner, 1));
-
- $users[] = $owner;
-
- return array_unique( $users );
-
- }
-
/**
* @brief Find, sanitise and format users sharing a file
* @note This wraps other methods into a portable bundle
--
GitLab
From 0e1970438b6dd7b6f705aeb420e1d4b4bd27c609 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 18 Apr 2013 22:34:22 +0200
Subject: [PATCH 075/304] fixed incorrect filesize, download via web is now
possible fixed broken file-info
---
apps/files_encryption/lib/proxy.php | 36 ++++++++++++++++++++++++++--
apps/files_encryption/lib/stream.php | 2 +-
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 3af9dc73d8..e23598bb5f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -439,9 +439,41 @@ class Proxy extends \OC_FileProxy {
public function postFileSize( $path, $size ) {
- if ( Crypt::isCatfileContent( $path ) ) {
+ // Reformat path for use with OC_FSV
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
+
+ if ( Crypt::isEncryptedMeta( $path_f ) ) {
- $cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ // get file info
+ $cached = \OC\Files\Filesystem::getFileInfo( $path_f, '' );
+
+ // calculate last chunk nr
+ $lastChunckNr = floor( $size / 8192);
+
+ // open stream
+ $result = fopen( 'crypt://'.$path_f, "r" );
+
+ // calculate last chunk position
+ $lastChunckPos = ( $lastChunckNr * 8192 );
+
+ // seek to end
+ fseek( $result, $lastChunckPos );
+
+ // get the content of the last chunck
+ $lastChunkContent = fgets( $result );
+
+ // calc the real filesize with the size of the last chunk
+ $realSize = ( ( $lastChunckNr * 6126 ) + strlen( $lastChunkContent ) );
+
+ // enable proxy
+ \OC_FileProxy::$enabled = true;
+
+ // set the size
+ $cached['size'] = $realSize;
return $cached['size'];
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 01eee177cd..4b33c200bf 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -513,7 +513,7 @@ class Stream {
and $this->meta['mode']!='rb'
) {
- \OC\Files\Filesystem::putFileInfo( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
+ \OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => true, 'size' => $this->size ), '' );
}
--
GitLab
From 12785b93f188c85f19e52917c66aa749b9836ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 19 Apr 2013 13:17:08 +0200
Subject: [PATCH 076/304] make sure that all share keys get deleted if a
file/folder gets unshared from a user/group
---
apps/files_encryption/hooks/hooks.php | 15 +++++---
apps/files_encryption/lib/keymanager.php | 46 +++++++++++++++++-------
2 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 265b90a87a..2731ee1112 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -240,22 +240,27 @@ class Hooks {
// [shareType] => 0
// [shareWith] => test1
- // TODO: Should other kinds of item be encrypted too?
- if ( $params['itemType'] === 'file' ) {
+ if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
$view = new \OC_FilesystemView( '/' );
- $session = new Session();
+ $session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
-
+
+ if ($params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP) {
+ $userIds = \OC_Group::usersInGroup($params['shareWith']);
+ } else {
+ $userIds = array($params['shareWith']);
+ }
+
// If path is a folder, get all children
$allPaths = $util->getPaths( $path );
foreach ( $allPaths as $path ) {
// Unshare each child path
- if ( ! Keymanager::delShareKey( $view, $params['shareWith'], $path ) ) {
+ if ( ! Keymanager::delShareKey( $view, $userIds, $path ) ) {
$failed[] = $path;
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 5c5a6c7ec5..f23423062b 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -395,27 +395,28 @@ class Keymanager {
/**
* @brief Delete a single user's shareKey for a single file
*/
- public static function delShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+ public static function delShareKey( \OC_FilesystemView $view, $userIds, $filePath ) {
\OC_FileProxy::$enabled = false;
- $shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $filePath;
+ //here we need the currently logged in user, while userId can be a different user
+ $util = new Util( $view, \OCP\User::getUser() );
+
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+
+ $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
$result = false;
if ( $view->is_dir($shareKeyPath) ) {
- $result = $view->unlink($shareKeyPath);
- } else {
- $absPath = $view->getLocalFile($shareKeyPath);
-
- $matches = glob(preg_quote($absPath).'.*.shareKey' );
- if ( $matches ) {
+ $localPath = \OC_Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
+ $result = self::recursiveDelShareKeys($localPath, $userIds);
- foreach ( $matches as $ma ) {
- unlink($ma);
- }
+ } else {
+ foreach ($userIds as $userId) {
+ $view->unlink($shareKeyPath.'.'.$userId.'.shareKey');
}
$result = true;
@@ -432,7 +433,28 @@ class Keymanager {
return $result;
}
-
+
+ /**
+ * @brief recursively delete share keys from given users
+ *
+ * @param type $dir directory
+ * @param type $userIds user ids for which the share keys should be deleted
+ */
+ private static function recursiveDelShareKeys($dir, $userIds) {
+ foreach ($userIds as $userId) {
+ $completePath = $dir.'/.*'.'.'.$userId.'.shareKey';
+ $matches = glob(preg_quote($dir).'/*'.preg_quote('.'.$userId.'.shareKey'));
+ }
+ foreach ($matches as $ma) {
+ unlink($ma);
+ }
+ $subdirs = $directories = glob(preg_quote($dir) . '/*' , GLOB_ONLYDIR);
+ foreach ( $subdirs as $subdir ) {
+ self::recursiveDelShareKeys($subdir, $userIds);
+ }
+ return $true;
+ }
+
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
--
GitLab
From 6b47da10bea66d7a925de2850919b503201558be Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 22 Apr 2013 04:40:49 +0200
Subject: [PATCH 077/304] improved rename and file size support fix missing
user_id on write
---
apps/files_encryption/lib/proxy.php | 174 +++++++++++++++------------
apps/files_encryption/lib/stream.php | 31 ++---
2 files changed, 115 insertions(+), 90 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 67c93694e3..505fad440d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -288,38 +288,54 @@ class Proxy extends \OC_FileProxy {
* @return bool Result of rename()
* @note This is pre rather than post because using post didn't work
*/
- public function preRename( $oldPath, $newPath ) {
-
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView( '/' );
-
- $userId = \OCP\USER::getUser();
-
- // Format paths to be relative to user files dir
- $oldTrimmed = ltrim( $oldPath, '/' );
- $oldSplit = explode( '/', $oldTrimmed );
- $oldSliced = array_slice( $oldSplit, 2 );
- $oldRelPath = implode( '/', $oldSliced );
- $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath . '.key';
-
- $newTrimmed = ltrim( $newPath, '/' );
- $newSplit = explode( '/', $newTrimmed );
- $newSliced = array_slice( $newSplit, 2 );
- $newRelPath = implode( '/', $newSliced );
- $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath . '.key';
-
- // Rename keyfile so it isn't orphaned
- $result = $view->rename( $oldKeyfilePath, $newKeyfilePath );
-
- \OC_FileProxy::$enabled = true;
-
- return $result;
-
- }
-
- public function postFopen( $path, &$result ){
+ public function preRename( $oldPath, $newPath )
+ {
+
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+
+ $userId = \OCP\USER::getUser();
+
+ // Format paths to be relative to user files dir
+ $oldTrimmed = ltrim($oldPath, '/');
+ $oldSplit = explode('/', $oldTrimmed);
+ $oldSliced = array_slice($oldSplit, 2);
+ $oldRelPath = implode('/', $oldSliced);
+ $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath;
+
+
+ $newTrimmed = ltrim($newPath, '/');
+ $newSplit = explode('/', $newTrimmed);
+ $newSliced = array_slice($newSplit, 2);
+ $newRelPath = implode('/', $newSliced);
+ $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath;
+
+ // add key ext if this is not an folder
+ if (!$view->is_dir($oldKeyfilePath)) {
+ $oldKeyfilePath .= '.key';
+ $newKeyfilePath .= '.key';
+ } else {
+ // handle share-keys folders
+ $oldShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $oldRelPath;
+ $newShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $newRelPath;
+ $view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
+ }
+
+ //TODO add support for share-keys files
+ //...
+
+ // Rename keyfile so it isn't orphaned
+ $result = $view->rename($oldKeyfilePath, $newKeyfilePath);
+
+ \OC_FileProxy::$enabled = true;
+
+ return $result;
+
+ }
+
+ public function postFopen( $path, &$result ){
if ( !$result ) {
@@ -421,49 +437,55 @@ class Proxy extends \OC_FileProxy {
}
public function postFileSize( $path, $size ) {
-
- // Reformat path for use with OC_FSV
- $path_split = explode( '/', $path );
- $path_f = implode( '/', array_slice( $path_split, 3 ) );
-
- if ( Crypt::isEncryptedMeta( $path_f ) ) {
-
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- // get file info
- $cached = \OC\Files\Filesystem::getFileInfo( $path_f, '' );
-
- // calculate last chunk nr
- $lastChunckNr = floor( $size / 8192);
-
- // open stream
- $result = fopen( 'crypt://'.$path_f, "r" );
-
- // calculate last chunk position
- $lastChunckPos = ( $lastChunckNr * 8192 );
-
- // seek to end
- fseek( $result, $lastChunckPos );
-
- // get the content of the last chunck
- $lastChunkContent = fgets( $result );
-
- // calc the real filesize with the size of the last chunk
- $realSize = ( ( $lastChunckNr * 6126 ) + strlen( $lastChunkContent ) );
-
- // enable proxy
- \OC_FileProxy::$enabled = true;
-
- // set the size
- $cached['size'] = $realSize;
-
- return $cached['size'];
-
- } else {
-
- return $size;
-
- }
+
+ // Reformat path for use with OC_FSV
+ $path_split = explode('/', $path);
+ $path_f = implode('/', array_slice($path_split, 3));
+
+ $view = new \OC_FilesystemView( '/' );
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+
+ if ($util->isEncryptedPath($path)) {
+
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ // get file info
+ $cached = \OC\Files\Filesystem::getFileInfo($path_f, '');
+
+ // calculate last chunk nr
+ $lastChunckNr = floor($size / 8192);
+
+ // open stream
+ $result = fopen('crypt://' . $path_f, "r");
+
+ if(is_resource($result)) {
+ // calculate last chunk position
+ $lastChunckPos = ($lastChunckNr * 8192);
+
+ // seek to end
+ fseek($result, $lastChunckPos);
+
+ // get the content of the last chunck
+ $lastChunkContent = fgets($result);
+
+ // calc the real file size with the size of the last chunk
+ $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
+
+ // set the size
+ $cached['size'] = $realSize;
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = true;
+
+ return $cached['size'];
+
+ } else {
+
+ return $size;
+
+ }
}
}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 4b33c200bf..c12fab783b 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -101,6 +101,9 @@ class Stream {
} else {
+ // Disable fileproxies so we can get the file size and open the source file without recursive encryption
+ \OC_FileProxy::$enabled = false;
+
if (
$mode == 'w'
or $mode == 'w+'
@@ -119,9 +122,6 @@ class Stream {
}
- // Disable fileproxies so we can open the source file without recursive encryption
- \OC_FileProxy::$enabled = false;
-
//$this->handle = fopen( $this->rawPath, $mode );
$this->handle = $this->rootView->fopen( $this->rawPath, $mode );
@@ -240,14 +240,13 @@ class Stream {
// Avoid problems with .part file extensions
$this->relPath = Keymanager::fixPartialFilePath( $this->relPath );
-
+
+ // Fetch and decrypt keyfile
+ // Fetch existing keyfile
+ $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
+
// If a keyfile already exists
- if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->relPath . '.key' ) ) {
-
- // Fetch and decrypt keyfile
- // Fetch existing keyfile
- $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
-
+ if ( $this->encKeyfile ) {
$this->setUserProperty();
$session = new Session( $this->rootView );
@@ -338,11 +337,15 @@ class Stream {
// Get all users sharing the file
$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath );
-
+
+ // allways add current user
+ $uniqueUserIds[] = $this->userId;
+ array_unique( $uniqueUserIds );
+
// Fetch public keys for all sharing users
$publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
-
- // Encrypt enc key for all sharing users
+
+ // Encrypt enc key for all sharing users
$this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
$view = new \OC_FilesystemView( '/' );
@@ -429,7 +432,7 @@ class Stream {
$encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
- trigger_error("\$encrypted = $encrypted");
+ //trigger_error("\$encrypted = $encrypted");
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
--
GitLab
From a2ba3c8a43780eab5ad8a4d96db33c584e7ae2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 11:58:39 +0200
Subject: [PATCH 078/304] fix sharing of folders. First we need to collect all
files. Than we need to find all users with access to the file because this
can vary from file to file and than we can encrypt it for all recipients
---
apps/files_encryption/hooks/hooks.php | 58 +++++++++++++--------------
apps/files_encryption/lib/util.php | 20 +++++++++
2 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2731ee1112..13cf352b4e 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -166,8 +166,8 @@ class Hooks {
/**
* @brief
*/
- public static function postShared( $params ) {
-
+ public static function postShared($params) {
+
// NOTE: $params has keys:
// [itemType] => file
// itemSource -> int, filecache file ID
@@ -183,50 +183,46 @@ class Hooks {
// [fileSource] => 13
// [fileTarget] => /test8
// [id] => 10
- // [token] =>
-
+ // [token] =>
// TODO: Should other kinds of item be encrypted too?
- if ( $params['itemType'] === 'file' ) {
-
- $view = new \OC_FilesystemView( '/' );
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $view = new \OC_FilesystemView('/');
$session = new Session($view);
$userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
- $path = $util->fileIdToPath( $params['itemSource'] );
+ $util = new Util($view, $userId);
+ $path = $util->fileIdToPath($params['itemSource']);
$sharingEnabled = \OCP\Share::isEnabled();
- $usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path);
-
- // Recursively expand path to include subfiles
- $allPaths = $util->getPaths( $path );
-
- $failed = array();
-
- // Loop through all subfiles
- foreach ( $allPaths as $path ) {
-
+
+ if ($params['itemType'] === 'folder') {
+ //list($owner, $ownerPath) = $util->getUidAndFilename($filePath);
+ $allFiles = $util->getAllFiles($path);
+ } else {
+ $allFiles = array($path);
+ }
+
+ foreach ($allFiles as $path) {
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
+
+ $failed = array();
+
// Attempt to set shareKey
- if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
-
+ if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {
+
$failed[] = $path;
-
}
-
}
-
+
// If no attempts to set keyfiles failed
- if ( empty( $failed ) ) {
-
+ if (empty($failed)) {
+
return true;
-
} else {
-
+
return false;
-
}
-
}
-
}
/**
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8807de7c2a..b3df7f0db0 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -939,4 +939,24 @@ class Util {
}
+ /**
+ *@ brief geo recursively through a dir and collect all files and sub files.
+ * @param type $dir relative to the users files folder
+ * @return array with list of files relative to the users files folder
+ */
+ public function getAllFiles($dir) {
+ $result = array();
+ $path = $this->view->getLocalFile();
+ $content = $this->view->getDirectoryContent("/".$this->userFilesDir.'/'.$this->filesFolderName.$dir);
+
+ foreach ($content as $c) {
+ if ($c['type'] === "dir" ) {
+ $result = array_merge($result, $this->getAllFiles(substr($c['path'],5)));
+ } else {
+ $result[] = substr($c['path'], 5);
+ }
+ }
+ return $result;
+ }
+
}
--
GitLab
From 8a46e809f00745f4b67d118e85ec2d35e74b732e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 12:22:07 +0200
Subject: [PATCH 079/304] remove util::getPaths(), this function was broken and
is replaced my util::getAllFiles(). When unsharing a folder only remove the
share key for sub files if the user really no longer have access to the file.
Can happen that a sub-file/-folder is shared to a group the user is a member
of or explicitly once more to the same user
---
apps/files_encryption/hooks/hooks.php | 21 +++++++----
apps/files_encryption/lib/util.php | 51 ---------------------------
2 files changed, 14 insertions(+), 58 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 13cf352b4e..e3861e7cc5 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -196,7 +196,6 @@ class Hooks {
$sharingEnabled = \OCP\Share::isEnabled();
if ($params['itemType'] === 'folder') {
- //list($owner, $ownerPath) = $util->getUidAndFilename($filePath);
$allFiles = $util->getAllFiles($path);
} else {
$allFiles = array($path);
@@ -250,13 +249,21 @@ class Hooks {
$userIds = array($params['shareWith']);
}
- // If path is a folder, get all children
- $allPaths = $util->getPaths( $path );
-
- foreach ( $allPaths as $path ) {
+ if ($params['itemType'] === 'folder') {
+ $allFiles = $util->getAllFiles($path);
+ } else {
+ $allFiles = array($path);
+ }
+
- // Unshare each child path
- if ( ! Keymanager::delShareKey( $view, $userIds, $path ) ) {
+ foreach ( $allFiles as $path ) {
+
+ // check if the user still has access to the file, otherwise delete share key
+ $sharingUsers = $util->getSharingUsersArray(true, $path);
+
+ // Unshare every user who no longer has access to the file
+ $delUsers = array_diff($userIds, $sharingUsers);
+ if ( ! Keymanager::delShareKey( $view, $delUsers, $path ) ) {
$failed[] = $path;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b3df7f0db0..de63e0ff9f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -693,58 +693,7 @@ class Util {
);
}
-
- /**
- * @brief Expand given path to all sub files & folders
- * @param string $path path which needs to be updated
- * @return array $pathsArray all found file paths
- * @note Paths of directories excluded, only *file* paths are returned
- */
- public function getPaths( $path ) {
- // Default return value is success
- $result = true;
-
- // Make path include 'files' dir for OC_FSV operations
- $fPath = 'files' . $path;
-
- // If we're handling a single file
- if ( ! $this->view->is_dir( $fPath ) ) {
-
- $pathsArray[] = $path;
-
- // If we're handling a folder (recursively)
- } else {
-
- $subFiles = $this->view->getDirectoryContent( $fPath );
-
- foreach ( $subFiles as $file ) {
-
- $filePath = substr( $file['path'], 5 );
-
- // If this is a nested file
- if ( ! $this->view->is_dir( $fPath ) ) {
-
- // Add the file path to array
- $pathsArray[] = $path;
-
- } else {
-
- // If this is a nested folder
- $dirPaths = $this->getPaths( $filePath );
-
- // Add all subfiles & folders to the array
- $pathsArray = array_merge( $dirPaths, $pathsArray );
-
- }
- }
-
- }
-
- return $pathsArray;
-
- }
-
/**
* @brief Decrypt a keyfile without knowing how it was encrypted
* @param string $filePath
--
GitLab
From f6ac34afea6c1f68f53e0e7a076b0b274559fd8b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 22 Apr 2013 12:25:55 +0200
Subject: [PATCH 080/304] improved handling for getSharingUsersArray
---
apps/files_encryption/lib/proxy.php | 2 +-
apps/files_encryption/lib/stream.php | 10 +++-------
apps/files_encryption/lib/util.php | 9 +++++++--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 505fad440d..bc6280ff61 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -134,7 +134,7 @@ class Proxy extends \OC_FileProxy {
$sharingEnabled = \OCP\Share::isEnabled();
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath );
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
// Fetch public keys for all users who will share the file
$publicKeys = Keymanager::getPublicKeys( $rootView, $uniqueUserIds );
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index c12fab783b..6fb95934c3 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -335,14 +335,10 @@ class Stream {
$util = new Util( $this->rootView, $this->userId );
- // Get all users sharing the file
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath );
+ // Get all users sharing the file includes current user
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId);
- // allways add current user
- $uniqueUserIds[] = $this->userId;
- array_unique( $uniqueUserIds );
-
- // Fetch public keys for all sharing users
+ // Fetch public keys for all sharing users
$publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
// Encrypt enc key for all sharing users
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b3df7f0db0..e69314e099 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -848,7 +848,7 @@ class Util {
* @brief Find, sanitise and format users sharing a file
* @note This wraps other methods into a portable bundle
*/
- public function getSharingUsersArray( $sharingEnabled, $filePath ) {
+ public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
// Check if key recovery is enabled
$recoveryEnabled = $this->recoveryEnabled();
@@ -878,7 +878,12 @@ class Util {
$userIds[] = $adminUid;
}
-
+
+ // add current user if given
+ if($currentUserId != false) {
+ $userIds[] = $currentUserId;
+ }
+
// Remove duplicate UIDs
$uniqueUserIds = array_unique ( $userIds );
--
GitLab
From 17059388482eabf6a1d05ea4c8d09e0f67ed9c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 12:32:38 +0200
Subject: [PATCH 081/304] removed some leftover code; use already existing var
for path to users file folder
---
apps/files_encryption/lib/util.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index de63e0ff9f..d1377df9a9 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -895,8 +895,8 @@ class Util {
*/
public function getAllFiles($dir) {
$result = array();
- $path = $this->view->getLocalFile();
- $content = $this->view->getDirectoryContent("/".$this->userFilesDir.'/'.$this->filesFolderName.$dir);
+
+ $content = $this->view->getDirectoryContent($this->userFilesDir.$dir);
foreach ($content as $c) {
if ($c['type'] === "dir" ) {
--
GitLab
From b24a673714289bf515c93999a1dd0dfc552eb7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 14:12:18 +0200
Subject: [PATCH 082/304] the owner uid is not interesting. We want to get all
users who have access to the given item source, no matter from whom it was
shared
---
lib/public/share.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index acdf895c92..9fd8eb42fb 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -150,10 +150,10 @@ class Share {
FROM
`*PREFIX*share`
WHERE
- item_source = ? AND share_type = ? AND uid_owner = ?'
+ item_source = ? AND share_type = ?'
);
- $result = $query->execute( array( $source, self::SHARE_TYPE_USER, $user ) );
+ $result = $query->execute( array( $source, self::SHARE_TYPE_USER ) );
if ( \OC_DB::isError( $result ) ) {
\OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
@@ -170,10 +170,10 @@ class Share {
FROM
`*PREFIX*share`
WHERE
- item_source = ? AND share_type = ? AND uid_owner = ?'
+ item_source = ? AND share_type = ?'
);
- $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP, $user ) );
+ $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP ) );
if ( \OC_DB::isError( $result ) ) {
\OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
@@ -190,10 +190,10 @@ class Share {
FROM
`*PREFIX*share`
WHERE
- item_source = ? AND share_type = ? AND uid_owner = ?'
+ item_source = ? AND share_type = ?'
);
- $result = $query->execute( array( $source, self::SHARE_TYPE_LINK, $user ) );
+ $result = $query->execute( array( $source, self::SHARE_TYPE_LINK ) );
if ( \OC_DB::isError( $result ) ) {
\OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
--
GitLab
From bcb2e87846407959a1826b3c38d6956d180e3468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 14:13:59 +0200
Subject: [PATCH 083/304] check if the item source was shared to me to decide
if it is a re-share or not. Re-sharing of encrypted files should work now, we
might still need to test some corner cases
---
apps/files_encryption/hooks/hooks.php | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e3861e7cc5..88ec64b492 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -193,8 +193,18 @@ class Hooks {
$util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
+ //check if this is a reshare action, that's true if the item source is already shared with me
+ $sharedItem = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);
+ if ($sharedItem) {
+ // if it is a re-share than the file is located in my Shared folder
+ $path = '/Shared'.$sharedItem['file_target'];
+ } else {
+ $path = $util->fileIdToPath($params['itemSource']);
+ }
+
$sharingEnabled = \OCP\Share::isEnabled();
+ // if a folder was shared, get a list if all (sub-)folders
if ($params['itemType'] === 'folder') {
$allFiles = $util->getAllFiles($path);
} else {
@@ -243,12 +253,14 @@ class Hooks {
$util = new Util( $view, $userId );
$path = $util->fileIdToPath( $params['itemSource'] );
+ // for group shares get a list of the group members
if ($params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP) {
$userIds = \OC_Group::usersInGroup($params['shareWith']);
} else {
$userIds = array($params['shareWith']);
}
+ // if we unshare a folder we need a list of all (sub-)files
if ($params['itemType'] === 'folder') {
$allFiles = $util->getAllFiles($path);
} else {
--
GitLab
From b57478fa27a2dc2dcfeba68064e44aca5848e145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 14:14:28 +0200
Subject: [PATCH 084/304] fix comment, remove unused variable
---
apps/files_encryption/lib/util.php | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d1377df9a9..1ba339c15d 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -805,15 +805,10 @@ class Util {
// Make sure that a share key is generated for the owner too
list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
- //$userIds = array( $this->userId );
- $userIds = array();
-
if ( $sharingEnabled ) {
// Find out who, if anyone, is sharing the file
- $shareUids = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
-
- $userIds = array_merge( $userIds, $shareUids );
+ $userIds = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
}
@@ -889,7 +884,7 @@ class Util {
}
/**
- *@ brief geo recursively through a dir and collect all files and sub files.
+ * @brief geo recursively through a dir and collect all files and sub files.
* @param type $dir relative to the users files folder
* @return array with list of files relative to the users files folder
*/
--
GitLab
From b5cb5dab513441b8c914aaa043921d0affae4604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 14:30:10 +0200
Subject: [PATCH 085/304] fix encryption to owncloud user for public link
shares
---
apps/files_encryption/lib/keymanager.php | 2 +-
apps/files_encryption/lib/util.php | 2 +-
lib/public/share.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index f23423062b..6fb1f128b5 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -54,7 +54,7 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
- return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+ return $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
\OC_FileProxy::$enabled = true;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 1ba339c15d..143ba69f25 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -668,7 +668,7 @@ class Util {
// public system user 'ownCloud' (for public shares)
if (
$util->ready()
- or $user == 'ownCloud'
+ or $user == 'owncloud'
) {
// Construct array of ready UIDs for Keymanager{}
diff --git a/lib/public/share.php b/lib/public/share.php
index 9fd8eb42fb..5cd556c6ac 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -200,7 +200,7 @@ class Share {
}
if ($result->fetchRow()) {
- $shares[] = "ownCloud";
+ $shares[] = "owncloud";
}
}
// Include owner in list of users, if requested
--
GitLab
From a4364a93d0e80e0d1daa2b28713df05c25970fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 22 Apr 2013 15:29:58 +0200
Subject: [PATCH 086/304] delete all share keys if a file gets deleted
---
apps/files_encryption/lib/keymanager.php | 21 ++++++++++++++++++++-
apps/files_encryption/lib/proxy.php | 11 +++--------
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 6fb1f128b5..9885f5e550 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -391,7 +391,26 @@ class Keymanager {
return $result;
}
-
+
+ /**
+ * @brief delete all share keys of a given file
+ * @param \OC_FilesystemView $view
+ * @param type $userId owner of the file
+ * @param type $filePath path to the file, relative to the owners file dir
+ */
+ public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
+
+ if ($view->is_dir($userId.'/files/'.$filePath)) {
+ $view->unlink($userId.'/files_encryption/share-keys/'.$filePath);
+ } else {
+ $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$filePath);
+ $matches = glob(preg_quote($localKeyPath).'*.shareKey');
+ foreach ($matches as $ma) {
+ unlink($ma);
+ }
+ }
+ }
+
/**
* @brief Delete a single user's shareKey for a single file
*/
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 505fad440d..bd25465ee6 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -256,18 +256,13 @@ class Proxy extends \OC_FileProxy {
// Format path to be relative to user files dir
$relPath = $util->stripUserFilesPath( $path );
-// list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
-
- $fileOwner = \OC\Files\Filesystem::getOwner( $path );
- $ownerPath = $util->stripUserFilesPath( $path ); // TODO: Don't trust $path, fetch owner path
-
- $filePath = $fileOwner . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $ownerPath;
+ list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
// Delete keyfile & shareKey so it isn't orphaned
if (
! (
- Keymanager::deleteFileKey( $view, $fileOwner, $ownerPath )
- && Keymanager::delShareKey( $view, $fileOwner, $ownerPath )
+ Keymanager::deleteFileKey( $view, $owner, $ownerPath )
+ && Keymanager::delAllShareKeys( $view, $owner, $ownerPath )
)
) {
--
GitLab
From 37c72059417d2f2f776ee4318e3705adf6c54fe7 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 22 Apr 2013 18:50:59 +0200
Subject: [PATCH 087/304] fix wrong file path in util
---
apps/files_encryption/lib/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 9868aba02e..6e8786b7cd 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -337,7 +337,7 @@ class Util {
// scanning every file like this
// will eat server resources :(
if (
- Keymanager::getFileKey( $this->view, $this->userId, $file )
+ Keymanager::getFileKey( $this->view, $this->userId, $relPath )
&& Crypt::isCatfileContent( $data )
) {
--
GitLab
From 8ab9433fdff179649a5e5b9d6046d85efd81d3b8 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 22 Apr 2013 18:54:23 +0200
Subject: [PATCH 088/304] fix wrong file path in proxy
---
apps/files_encryption/lib/proxy.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 1a96f1e495..e058a528ad 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -266,7 +266,7 @@ class Proxy extends \OC_FileProxy {
)
) {
- \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "'.$filePath.'"', \OC_Log::ERROR );
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "'.$ownerPath.'"', \OC_Log::ERROR );
}
--
GitLab
From a1d241783ee44529fac99ba25cb34b658f827876 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 23 Apr 2013 14:12:28 +0200
Subject: [PATCH 089/304] Updated buglist
---
apps/files_encryption/lib/util.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 1b69ad320c..f7bb51a861 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -24,20 +24,16 @@
# Bugs
# ----
# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# Sharing files to other users currently broken (due to merge + ongoing implementation of support for lost password recovery)
# Timeouts on first login due to encryption of very large files (fix in progress, as a result streaming is currently broken)
# Sharing all files to admin for recovery purposes still in progress
# Possibly public links are broken (not tested since last merge of master)
-# getOwner() currently returns false in all circumstances, unsure what code is returning this...
# encryptAll during login mangles paths: /files/files/
# encryptAll is accessing files via encryption proxy - perhaps proxies should be disabled?
-# Sharekeys appear to not be deleted when their parent file is, and thus get orphaned
# Missing features
# ----------------
# Make sure user knows if large files weren't encrypted
-# Support for resharing encrypted files
# Test
--
GitLab
From c6bfc7315b380710d7c59f7bb23588822063dc6f Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 23 Apr 2013 17:36:35 +0200
Subject: [PATCH 090/304] Stream writing improved: working with dolphin + kate,
gedit & nautilus give errors, suspect those issues are clientside .part file
paths fixed in stream{}
---
apps/files_encryption/lib/proxy.php | 5 -----
apps/files_encryption/lib/stream.php | 22 ++++++----------------
apps/files_encryption/lib/util.php | 2 +-
3 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index e058a528ad..0d20ff1af1 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -118,9 +118,6 @@ class Proxy extends \OC_FileProxy {
// Decrypt the keyfile
$plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
-
-// trigger_error("\$shareKey = $shareKey");
-// trigger_error("\$plainKey = $plainKey");
} else {
@@ -207,8 +204,6 @@ class Proxy extends \OC_FileProxy {
$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
$plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
-
-// trigger_error("PLAINDATA = ". var_export($plainData, 1));
} elseif (
Crypt::mode() == 'server'
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 6fb95934c3..9a37c3b08e 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -86,6 +86,9 @@ class Stream {
// rawPath is relative to the data directory
$this->rawPath = $this->userId . '/files/' . $this->relPath;
+ // Fix .part filenames
+ $this->rawPath = Keymanager::fixPartialFilePath( $this->rawPath );
+
if (
dirname( $this->rawPath ) == 'streams'
and isset( self::$sourceStreams[basename( $this->rawPath )] )
@@ -257,11 +260,6 @@ class Stream {
$this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
-// trigger_error( '$this->relPath = '.$this->relPath );
-// trigger_error( '$this->userId = '.$this->userId);
-// trigger_error( '$this->encKeyfile = '.$this->encKeyfile );
-// trigger_error( '$this->plainKey1 = '.var_export($this->plainKey, 1));
-
return true;
} else {
@@ -352,12 +350,6 @@ class Stream {
// Save the sharekeys
Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
-// trigger_error( "\$this->encKeyfiles['data'] = ".$this->encKeyfiles['data'] );
-// trigger_error( '$this->relPath = '.$this->relPath );
-// trigger_error( '$this->userId = '.$this->userId);
-// trigger_error( '$this->encKeyfile = '.var_export($this->encKeyfiles, 1) );
-// trigger_error( '$this->plainKey2 = '.var_export($this->plainKey, 1));
-
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
if ( $this->writeCache ) {
@@ -420,7 +412,7 @@ class Stream {
// Clear $data ready for next round
$data = '';
-//
+
} else {
// Read the chunk from the start of $data
@@ -428,8 +420,6 @@ class Stream {
$encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
- //trigger_error("\$encrypted = $encrypted");
-
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
@@ -515,9 +505,9 @@ class Stream {
\OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => true, 'size' => $this->size ), '' );
}
-
- return fclose( $this->handle );
+ return fclose( $this->handle );
+
}
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f7bb51a861..38b4219f6e 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -492,7 +492,7 @@ class Util {
* @note Encryption is recursive
*/
public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
-
+
if ( $found = $this->findEncFiles( $dirPath ) ) {
// Disable proxy to prevent file being encrypted twice
--
GitLab
From b7d8da87d0b094c5e55a0ac43995074fa3351618 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 23 Apr 2013 18:41:01 +0200
Subject: [PATCH 091/304] Development snapshot working on stream handling
(large files) in Util->encryptAll()
---
apps/files_encryption/lib/keymanager.php | 3 +-
apps/files_encryption/lib/proxy.php | 1 -
apps/files_encryption/lib/util.php | 50 ++++++++++++------------
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9885f5e550..0e1dafeed7 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -106,6 +106,7 @@ class Keymanager {
*/
public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
@@ -129,7 +130,7 @@ class Keymanager {
$result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
return $result;
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 0d20ff1af1..620f7cc8c3 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -142,7 +142,6 @@ class Proxy extends \OC_FileProxy {
$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
// Save sharekeys to user folders
-
Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
// Set encrypted keyfile as common varname
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 38b4219f6e..f9198e0606 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -500,37 +500,39 @@ class Util {
// Encrypt unencrypted files
foreach ( $found['plain'] as $plainFile ) {
-
- // Open plain file handle
-
-
- // Open enc file handle
-
-
- // Read plain file in chunks
//relative to data/<user>/file
$relPath = $plainFile['path'];
+
//relative to /data
$rawPath = $this->userId . '/files/' . $plainFile['path'];
-
- // Open handle with for binary reading
- $plainHandle = $this->view->fopen( $rawPath, 'rb' );
- // Open handle with for binary writing
-
- $encHandle = fopen( 'crypt://' . $relPath . '.tmp', 'wb' );
- // Overwrite the existing file with the encrypted one
- //$this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
- $size = stream_copy_to_stream( $plainHandle, $encHandle );
-
- $this->view->rename($rawPath . '.tmp', $rawPath);
-
- // Fetch the key that has just been set/updated by the stream
- //$encKey = Keymanager::getFileKey( $this->view, $this->userId, $relPath );
+ // Open plain file handle for binary reading
+ $plainHandle1 = $this->view->fopen( $rawPath, 'rb' );
+
+ // 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
+ $plainHandle2 = $this->view->fopen( $rawPath . '.plaintmp', 'wb' );
+
+ // Move plain file to a temporary location
+ stream_copy_to_stream( $plainHandle1, $plainHandle2 );
+
+ // Close access to original file
+// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
+
+ // Delete original plain file so we can rename enc file later
+ $this->view->unlink( $rawPath );
+
+ // Open enc file handle for binary writing, with same filename as original plain file
+ $encHandle = fopen( 'crypt://' . $relPath, 'wb' );
+
+ // Save data from plain stream to new encrypted file via enc stream
+ // NOTE: Stream{} will be invoked for handling
+ // the encryption, and should handle all keys
+ // and their generation etc. automatically
+ $size = stream_copy_to_stream( $plainHandle2, $encHandle );
- // Save keyfile
- //Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encKey );
+ // Delete temporary plain copy of file
+ $this->view->unlink( $rawPath . '.plaintmp' );
// Add the file to the cache
\OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
--
GitLab
From baa6fd639fb9e6b2a954975603428603fcd04a85 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 23 Apr 2013 19:08:52 +0200
Subject: [PATCH 092/304] improved file size handling
---
apps/files_encryption/lib/proxy.php | 92 +++++++++++++++++++----------
1 file changed, 60 insertions(+), 32 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index e058a528ad..cb7cb8a2cc 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -91,14 +91,14 @@ class Proxy extends \OC_FileProxy {
return false;
}
- public function preFile_put_contents( $path, &$data ) {
-
- if ( self::shouldEncrypt( $path ) ) {
-
- // Stream put contents should have been converted to fopen
+ public function preFile_put_contents( $path, &$data ) {
+
+ if ( self::shouldEncrypt( $path ) ) {
+
+ // Stream put contents should have been converted to fopen
if ( !is_resource( $data ) ) {
-
- $userId = \OCP\USER::getUser();
+
+ $userId = \OCP\USER::getUser();
$rootView = new \OC_FilesystemView( '/' );
$util = new Util( $rootView, $userId );
$session = new Session( $rootView );
@@ -135,8 +135,8 @@ class Proxy extends \OC_FileProxy {
$sharingEnabled = \OCP\Share::isEnabled();
$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
-
- // Fetch public keys for all users who will share the file
+
+ // Fetch public keys for all users who will share the file
$publicKeys = Keymanager::getPublicKeys( $rootView, $uniqueUserIds );
\OC_FileProxy::$enabled = false;
@@ -165,7 +165,8 @@ class Proxy extends \OC_FileProxy {
}
}
-
+
+ return true;
}
/**
@@ -174,7 +175,7 @@ class Proxy extends \OC_FileProxy {
*/
public function postFile_get_contents( $path, $data ) {
- // FIXME: $path for shared files is just /uid/files/Shared/filepath
+ // FIXME: $path for shared files is just /uid/files/Shared/filepath
$userId = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' );
@@ -300,7 +301,6 @@ class Proxy extends \OC_FileProxy {
$oldRelPath = implode('/', $oldSliced);
$oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath;
-
$newTrimmed = ltrim($newPath, '/');
$newSplit = explode('/', $newTrimmed);
$newSliced = array_slice($newSplit, 2);
@@ -331,14 +331,14 @@ class Proxy extends \OC_FileProxy {
}
public function postFopen( $path, &$result ){
-
- if ( !$result ) {
+
+ if ( !$result ) {
return $result;
}
-
- // Reformat path for use with OC_FSV
+
+ // Reformat path for use with OC_FSV
$path_split = explode( '/', $path );
$path_f = implode( '/', array_slice( $path_split, 3 ) );
@@ -394,8 +394,8 @@ class Proxy extends \OC_FileProxy {
// fclose( $tmp );
}
-
- $result = fopen( 'crypt://'.$path_f, $meta['mode'] );
+
+ $result = fopen( 'crypt://'.$path_f, $meta['mode'] );
}
@@ -407,8 +407,8 @@ class Proxy extends \OC_FileProxy {
}
public function postGetMimeType( $path, $mime ) {
-
- if ( Crypt::isCatfileContent( $path ) ) {
+
+ if ( Crypt::isCatfileContent( $path ) ) {
$mime = \OCP\Files::getMimeType( 'crypt://' . $path, 'w' );
@@ -418,9 +418,28 @@ class Proxy extends \OC_FileProxy {
}
+ public function postGetFileInfo( $path, $data ) {
+
+ // if path is a folder do nothing
+ if(is_array($data) && array_key_exists('size', $data)) {
+ // Disable encryption proxy to prevent recursive calls
+ \OC_FileProxy::$enabled = false;
+
+ // get file size
+ $data['size'] = self::postFileSize($path, $data['size']);
+
+ // Re-enable the proxy
+ \OC_FileProxy::$enabled = true;
+
+ trigger_error('postGetFileInfo '.$path.' size: '.$data['size']);
+ }
+
+ return $data;
+ }
+
public function postStat( $path, $data ) {
-
- if ( Crypt::isCatfileContent( $path ) ) {
+
+ if ( Crypt::isCatfileContent( $path ) ) {
$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
@@ -433,29 +452,38 @@ class Proxy extends \OC_FileProxy {
public function postFileSize( $path, $size ) {
+ $view = new \OC_FilesystemView( '/' );
+
+ // if path is a folder do nothing
+ if($view->is_dir($path)) {
+ return $size;
+ }
+
// Reformat path for use with OC_FSV
$path_split = explode('/', $path);
$path_f = implode('/', array_slice($path_split, 3));
- $view = new \OC_FilesystemView( '/' );
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
- if ($util->isEncryptedPath($path)) {
+
+ // FIXME: is there a better solution to check if file belongs to files path?
+ // only get file size if file is in 'files' path
+ if (count($path_split) >= 2 && $path_split[2] == 'files' && $util->isEncryptedPath($path)) {
// Disable encryption proxy to prevent recursive calls
\OC_FileProxy::$enabled = false;
- // get file info
- $cached = \OC\Files\Filesystem::getFileInfo($path_f, '');
-
- // calculate last chunk nr
- $lastChunckNr = floor($size / 8192);
-
// open stream
$result = fopen('crypt://' . $path_f, "r");
if(is_resource($result)) {
+ // don't trust the given size, allways get the size from filesystem
+ $size = $view->filesize($path);
+
+ // calculate last chunk nr
+ $lastChunckNr = floor($size / 8192);
+
// calculate last chunk position
$lastChunckPos = ($lastChunckNr * 8192);
@@ -469,13 +497,13 @@ class Proxy extends \OC_FileProxy {
$realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
// set the size
- $cached['size'] = $realSize;
+ $size = $realSize;
}
// enable proxy
\OC_FileProxy::$enabled = true;
- return $cached['size'];
+ return $size;
} else {
--
GitLab
From 25ff32db6bec0992b0fac18b04345aa5e99f4ea1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 23 Apr 2013 22:20:31 +0200
Subject: [PATCH 093/304] Added post proxy for getFileInfo. This is needed for
WebDAV and FileSize @samtuke and @schiesbn you guys know a better solution?
---
lib/files/view.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/files/view.php b/lib/files/view.php
index f607bb59aa..bd4812f8f8 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -724,6 +724,9 @@ class View {
$data['permissions'] = $permissions;
}
}
+
+ $data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);
+
return $data;
}
--
GitLab
From 170d09203f376fad452fc6959729a0f778b5934f Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 14:56:11 +0200
Subject: [PATCH 094/304] fixed file_proxy handling
---
apps/files_encryption/lib/keymanager.php | 52 +++++++++++++++---------
1 file changed, 33 insertions(+), 19 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 0e1dafeed7..ceefe8887a 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -51,12 +51,15 @@ class Keymanager {
* @return string public key or false
*/
public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- return $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
+ $result = $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
}
@@ -175,7 +178,8 @@ class Keymanager {
$filePath_f = ltrim( $filename, '/' );
$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if ( $view->file_exists( $keyfilePath ) ) {
@@ -188,7 +192,7 @@ class Keymanager {
}
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
return $result;
@@ -243,15 +247,17 @@ class Keymanager {
$user = \OCP\User::getUser();
$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
- return $view->file_put_contents( $user . '.private.key', $key );
-
- \OC_FileProxy::$enabled = true;
+ $result = $view->file_put_contents( $user . '.private.key', $key );
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
}
/**
@@ -276,14 +282,17 @@ class Keymanager {
public static function setPublicKey( $key ) {
$view = new \OC_FilesystemView( '/public-keys' );
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
- return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
+ $result = $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
}
@@ -310,11 +319,14 @@ class Keymanager {
$shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$result = $view->file_put_contents( $writePath, $shareKey );
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
if (
is_int( $result )
&& $result > 0
@@ -368,7 +380,8 @@ class Keymanager {
* of the keyfile must be performed by client code
*/
public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
@@ -387,7 +400,7 @@ class Keymanager {
}
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
return $result;
@@ -416,7 +429,8 @@ class Keymanager {
* @brief Delete a single user's shareKey for a single file
*/
public static function delShareKey( \OC_FilesystemView $view, $userIds, $filePath ) {
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
@@ -448,7 +462,7 @@ class Keymanager {
}
- \OC_FileProxy::$enabled = false;
+ \OC_FileProxy::$enabled = $proxyStatus;
return $result;
@@ -472,7 +486,7 @@ class Keymanager {
foreach ( $subdirs as $subdir ) {
self::recursiveDelShareKeys($subdir, $userIds);
}
- return $true;
+ return true;
}
/**
--
GitLab
From fac288a4ad8f6db907c0a2ddfeb0b772fe616db5 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 15:20:06 +0200
Subject: [PATCH 095/304] added unencrypted file size to file cache improved
file size calculation and speeds
---
apps/files_encryption/lib/proxy.php | 113 ++++++++++-----------------
apps/files_encryption/lib/stream.php | 14 ++--
db_structure.xml | 8 ++
lib/files/cache/cache.php | 11 +--
4 files changed, 62 insertions(+), 84 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index b805ec648d..c07b9a8a7a 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -108,7 +108,8 @@ class Proxy extends \OC_FileProxy {
$size = strlen( $data );
// Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
// Check if there is an existing key we can reuse
if ( $encKeyfile = Keymanager::getFileKey( $rootView, $userId, $filePath ) ) {
@@ -135,10 +136,8 @@ class Proxy extends \OC_FileProxy {
// Fetch public keys for all users who will share the file
$publicKeys = Keymanager::getPublicKeys( $rootView, $uniqueUserIds );
-
- \OC_FileProxy::$enabled = false;
-
- // Encrypt plain keyfile to multiple sharefiles
+
+ // Encrypt plain keyfile to multiple sharefiles
$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
// Save sharekeys to user folders
@@ -157,7 +156,7 @@ class Proxy extends \OC_FileProxy {
\OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
// Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
}
}
@@ -182,9 +181,10 @@ class Proxy extends \OC_FileProxy {
// TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
// Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- // If data is a catfile
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // If data is a catfile
if (
Crypt::mode() == 'server'
&& Crypt::isCatfileContent( $data ) // TODO: Do we really need this check? Can't we assume it is properly encrypted?
@@ -215,7 +215,7 @@ class Proxy extends \OC_FileProxy {
}
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
if ( ! isset( $plainData ) ) {
@@ -240,7 +240,8 @@ class Proxy extends \OC_FileProxy {
$path = Keymanager::fixPartialFilePath( $path );
// Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView( '/' );
@@ -265,7 +266,7 @@ class Proxy extends \OC_FileProxy {
}
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
// If we don't return true then file delete will fail; better
// to leave orphaned keyfiles than to disallow file deletion
@@ -282,6 +283,7 @@ class Proxy extends \OC_FileProxy {
{
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView('/');
@@ -318,7 +320,7 @@ class Proxy extends \OC_FileProxy {
// Rename keyfile so it isn't orphaned
$result = $view->rename($oldKeyfilePath, $newKeyfilePath);
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
return $result;
@@ -337,9 +339,10 @@ class Proxy extends \OC_FileProxy {
$path_f = implode( '/', array_slice( $path_split, 3 ) );
// Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- $meta = stream_get_meta_data( $result );
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $meta = stream_get_meta_data( $result );
$view = new \OC_FilesystemView( '' );
@@ -369,13 +372,13 @@ class Proxy extends \OC_FileProxy {
// NOTE: this is the case for new files saved via WebDAV
- if (
- $view->file_exists( $path )
- and $view->filesize( $path ) > 0
- ) {
- $x = $view->file_get_contents( $path );
-
- $tmp = tmpfile();
+// if (
+// $view->file_exists( $path )
+// and $view->filesize( $path ) > 0
+// ) {
+// $x = $view->file_get_contents( $path );
+//
+// $tmp = tmpfile();
// // Make a temporary copy of the original file
// \OCP\Files::streamCopy( $result, $tmp );
@@ -387,14 +390,14 @@ class Proxy extends \OC_FileProxy {
//
// fclose( $tmp );
- }
+// }
$result = fopen( 'crypt://'.$path_f, $meta['mode'] );
}
// Re-enable the proxy
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
return $result;
@@ -417,15 +420,15 @@ class Proxy extends \OC_FileProxy {
// if path is a folder do nothing
if(is_array($data) && array_key_exists('size', $data)) {
// Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
+
// get file size
$data['size'] = self::postFileSize($path, $data['size']);
// Re-enable the proxy
- \OC_FileProxy::$enabled = true;
-
- trigger_error('postGetFileInfo '.$path.' size: '.$data['size']);
+ \OC_FileProxy::$enabled = $proxyStatus;
}
return $data;
@@ -437,7 +440,7 @@ class Proxy extends \OC_FileProxy {
$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
- $data['size'] = $cached['size'];
+ $data['size'] = $cached['unencrypted_size'];
}
@@ -453,56 +456,20 @@ class Proxy extends \OC_FileProxy {
return $size;
}
+ $path = Keymanager::fixPartialFilePath( $path );
+
// Reformat path for use with OC_FSV
$path_split = explode('/', $path);
$path_f = implode('/', array_slice($path_split, 3));
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
-
-
- // FIXME: is there a better solution to check if file belongs to files path?
- // only get file size if file is in 'files' path
- if (count($path_split) >= 2 && $path_split[2] == 'files' && $util->isEncryptedPath($path)) {
-
- // Disable encryption proxy to prevent recursive calls
- \OC_FileProxy::$enabled = false;
-
- // open stream
- $result = fopen('crypt://' . $path_f, "r");
-
- if(is_resource($result)) {
- // don't trust the given size, allways get the size from filesystem
- $size = $view->filesize($path);
-
- // calculate last chunk nr
- $lastChunckNr = floor($size / 8192);
-
- // calculate last chunk position
- $lastChunckPos = ($lastChunckNr * 8192);
-
- // seek to end
- fseek($result, $lastChunckPos);
-
- // get the content of the last chunck
- $lastChunkContent = fgets($result);
-
- // calc the real file size with the size of the last chunk
- $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
-
- // set the size
- $size = $realSize;
- }
-
- // enable proxy
- \OC_FileProxy::$enabled = true;
-
- return $size;
+ // get file info from database/cache
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
+ // if file is encrypted return real file size
+ if(is_array($fileInfo) && $fileInfo['encrypted'] == 1) {
+ return $fileInfo['unencrypted_size'];
} else {
-
- return $size;
-
+ return $fileInfo['size'];
}
}
}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 9a37c3b08e..7e42627f8c 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -64,6 +64,7 @@ class Stream {
private $count;
private $writeCache;
public $size;
+ public $unencryptedSize;
private $publicKey;
private $keyfile;
private $encKeyfile;
@@ -105,6 +106,7 @@ class Stream {
} else {
// Disable fileproxies so we can get the file size and open the source file without recursive encryption
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if (
@@ -116,6 +118,7 @@ class Stream {
// We're writing a new file so start write counter with 0 bytes
$this->size = 0;
+ $this->unencryptedSize = 0;
} else {
@@ -129,7 +132,7 @@ class Stream {
$this->handle = $this->rootView->fopen( $this->rawPath, $mode );
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
if ( ! is_resource( $this->handle ) ) {
@@ -301,7 +304,7 @@ class Stream {
// automatically attempted when the file is written to disk -
// we are handling that separately here and we don't want to
// get into an infinite loop
- \OC_FileProxy::$enabled = false;
+ //\OC_FileProxy::$enabled = false;
// Get the length of the unencrypted data that we are handling
$length = strlen( $data );
@@ -438,7 +441,8 @@ class Stream {
}
$this->size = max( $this->size, $pointer + $length );
-
+ $this->unencryptedSize += $length;
+
return $length;
}
@@ -501,9 +505,7 @@ class Stream {
$this->meta['mode']!='r'
and $this->meta['mode']!='rb'
) {
-
- \OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => true, 'size' => $this->size ), '' );
-
+ \OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => 1, 'size' => $this->size, 'unencrypted_size' => $this->unencryptedSize ), '' );
}
return fclose( $this->handle );
diff --git a/db_structure.xml b/db_structure.xml
index dce90697b1..366f51a82d 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -288,6 +288,14 @@
<length>4</length>
</field>
+ <field>
+ <name>unencrypted_size</name>
+ <type>integer</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
<field>
<name>etag</name>
<type>text</type>
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 71b70abe3f..4e32ff2ba8 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -117,7 +117,7 @@ class Cache {
$params = array($file);
}
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` ' . $where);
$result = $query->execute($params);
$data = $result->fetchRow();
@@ -133,6 +133,7 @@ class Cache {
$data['size'] = (int)$data['size'];
$data['mtime'] = (int)$data['mtime'];
$data['encrypted'] = (bool)$data['encrypted'];
+ $data['unencrypted_size'] = (int)$data['unencrypted_size'];
$data['storage'] = $this->storageId;
$data['mimetype'] = $this->getMimetype($data['mimetype']);
$data['mimepart'] = $this->getMimetype($data['mimepart']);
@@ -151,7 +152,7 @@ class Cache {
$fileId = $this->getId($folder);
if ($fileId > -1) {
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
$result = $query->execute(array($fileId));
$files = $result->fetchAll();
@@ -234,7 +235,7 @@ class Cache {
* @return array
*/
function buildParts(array $data) {
- $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'etag');
+ $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'unencrypted_size', 'etag');
$params = array();
$queryParts = array();
foreach ($data as $name => $value) {
@@ -391,7 +392,7 @@ class Cache {
*/
public function search($pattern) {
$query = \OC_DB::prepare('
- SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'
);
$result = $query->execute(array($pattern, $this->numericId));
@@ -417,7 +418,7 @@ class Cache {
$where = '`mimepart` = ?';
}
$query = \OC_DB::prepare('
- SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+ SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?'
);
$mimetype = $this->getMimetypeId($mimetype);
--
GitLab
From 11d0eef8ccbbfaf7dee6fa4a58b9778c16bec895 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 15:21:11 +0200
Subject: [PATCH 096/304] fixed webdav errors, now webdav up - and downloads
are full working
---
apps/files_encryption/hooks/hooks.php | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 88ec64b492..2ac74ad6c4 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -40,7 +40,8 @@ class Hooks {
// Manually initialise Filesystem{} singleton with correct
// fake root path, in order to avoid fatal webdav errors
- \OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
+ // NOTE: disabled because this give errors on webdav!
+ //\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
$view = new \OC_FilesystemView( '/' );
@@ -66,8 +67,10 @@ class Hooks {
$session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
-
- $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+
+ //FIXME: disabled because it gets called each time a user do an operation on iPhone
+ //FIXME: we need a better place doing this and maybe only one time or by user
+ /*$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
// Set legacy encryption key if it exists, to support
// depreciated encryption system
@@ -86,12 +89,12 @@ class Hooks {
$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
- \OC_FileProxy::$enabled = false;
+ \OC_FileProxy::$enabled = false;*/
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
// app (see appinfo/spec.txt)
- if (
+ /*if (
$util->encryptAll( $publicKey, '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
) {
@@ -100,7 +103,7 @@ class Hooks {
, \OC_Log::INFO
);
- }
+ }*/
return true;
--
GitLab
From 328dea93c7a4a68bfb83c15f97af64275c953782 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 20:23:54 +0200
Subject: [PATCH 097/304] webdav fix for file chunking upload with big files
should now work @samtuke and @schiesbn we need a solution for the cache files
created by webdav
---
apps/files_encryption/lib/proxy.php | 7 ++++++-
apps/files_encryption/lib/util.php | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index c07b9a8a7a..66ea282312 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -337,7 +337,12 @@ class Proxy extends \OC_FileProxy {
// Reformat path for use with OC_FSV
$path_split = explode( '/', $path );
$path_f = implode( '/', array_slice( $path_split, 3 ) );
-
+
+ // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+ if($path_split[2] == 'cache') {
+ return $result;
+ }
+
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f9198e0606..2198963ce1 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -880,7 +880,7 @@ class Util {
} else {
- throw new \Exception( 'Supplied path could not be resolved "' . $path . '"' );
+ return false;
}
--
GitLab
From 672d177f10e44581ecc9f37844681afaa06c0272 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 22:43:15 +0200
Subject: [PATCH 098/304] added post rename proxy
---
lib/files/view.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/files/view.php b/lib/files/view.php
index bd4812f8f8..d0fc5910e6 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -362,6 +362,7 @@ class View {
list(, $internalPath2) = Filesystem::resolvePath($absolutePath2 . $postFix2);
if ($storage) {
$result = $storage->rename($internalPath1, $internalPath2);
+ \OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
} else {
$result = false;
}
--
GitLab
From 8ee7959092d8363f35de49819b44b6b8fe19bc34 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 22:49:47 +0200
Subject: [PATCH 099/304] implement postRename @samtuke no need anymore for
fixPartialFilePath this is now handled by rename share-keys are now handled
properly webdav .part files are handled properly
---
apps/files_encryption/lib/keymanager.php | 22 -------
apps/files_encryption/lib/proxy.php | 84 +++++++++++++++++++++---
apps/files_encryption/lib/stream.php | 10 +--
3 files changed, 77 insertions(+), 39 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index ceefe8887a..cfc13ee132 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -139,28 +139,6 @@ class Keymanager {
}
- /**
- * @brief Remove .path extension from a file path
- * @param string $path Path that may identify a .part file
- * @return string File path without .part extension
- */
- public static function fixPartialFilePath( $path ) {
-
- if ( preg_match( '/\.part$/', $path ) ) {
-
- $newLength = strlen( $path ) - 5;
- $fPath = substr( $path, 0, $newLength );
-
- return $fPath;
-
- } else {
-
- return $path;
-
- }
-
- }
-
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 66ea282312..7294c24366 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -237,8 +237,6 @@ class Proxy extends \OC_FileProxy {
return true;
}
- $path = Keymanager::fixPartialFilePath( $path );
-
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -307,6 +305,15 @@ class Proxy extends \OC_FileProxy {
if (!$view->is_dir($oldKeyfilePath)) {
$oldKeyfilePath .= '.key';
$newKeyfilePath .= '.key';
+
+ // handle share-keys
+ $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$oldRelPath);
+ $matches = glob(preg_quote($localKeyPath).'*.shareKey');
+ foreach ($matches as $src) {
+ $dst = str_replace($oldRelPath, $newRelPath, $src);
+ rename($src, $dst);
+ }
+
} else {
// handle share-keys folders
$oldShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $oldRelPath;
@@ -314,9 +321,6 @@ class Proxy extends \OC_FileProxy {
$view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
}
- //TODO add support for share-keys files
- //...
-
// Rename keyfile so it isn't orphaned
$result = $view->rename($oldKeyfilePath, $newKeyfilePath);
@@ -326,6 +330,70 @@ class Proxy extends \OC_FileProxy {
}
+ /**
+ * @brief When a file is renamed, rename its keyfile also
+ * @return bool Result of rename()
+ * @note This is pre rather than post because using post didn't work
+ */
+ public function postRename( $oldPath, $newPath )
+ {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+
+ // Reformat path for use with OC_FSV
+ $newPathSplit = explode( '/', $newPath );
+ $newPathRelative = implode( '/', array_slice( $newPathSplit, 3 ) );
+ $newPathRelativeToUser = implode( '/', array_slice( $newPathSplit, 2 ) );
+
+ // get file info from database/cache
+ //$newFileInfo = \OC\Files\Filesystem::getFileInfo($newPathRelative);
+
+ if ($util->isEncryptedPath($newPath)) {
+ $cached = $view->getFileInfo($newPath);
+ $cached['encrypted'] = 1;
+
+ // get the size from filesystem
+ $size = $view->filesize($newPath);
+
+ // calculate last chunk nr
+ $lastChunckNr = floor($size / 8192);
+
+ // open stream
+ $result = fopen('crypt://' . $newPathRelative, "r");
+
+ if(is_resource($result)) {
+ // calculate last chunk position
+ $lastChunckPos = ($lastChunckNr * 8192);
+
+ // seek to end
+ fseek($result, $lastChunckPos);
+
+ // get the content of the last chunck
+ $lastChunkContent = fread($result, 8192);
+
+ // calc the real file size with the size of the last chunk
+ $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
+
+ // set the size
+ $cached['unencrypted_size'] = $realSize;
+ }
+
+ $view->putFileInfo( $newPath, $cached );
+
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return true;
+
+ }
+
public function postFopen( $path, &$result ){
if ( !$result ) {
@@ -424,11 +492,11 @@ class Proxy extends \OC_FileProxy {
// if path is a folder do nothing
if(is_array($data) && array_key_exists('size', $data)) {
+
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
// get file size
$data['size'] = self::postFileSize($path, $data['size']);
@@ -461,8 +529,6 @@ class Proxy extends \OC_FileProxy {
return $size;
}
- $path = Keymanager::fixPartialFilePath( $path );
-
// Reformat path for use with OC_FSV
$path_split = explode('/', $path);
$path_f = implode('/', array_slice($path_split, 3));
@@ -474,7 +540,7 @@ class Proxy extends \OC_FileProxy {
if(is_array($fileInfo) && $fileInfo['encrypted'] == 1) {
return $fileInfo['unencrypted_size'];
} else {
- return $fileInfo['size'];
+ return $size;
}
}
}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 7e42627f8c..411bcdac92 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -87,10 +87,7 @@ class Stream {
// rawPath is relative to the data directory
$this->rawPath = $this->userId . '/files/' . $this->relPath;
- // Fix .part filenames
- $this->rawPath = Keymanager::fixPartialFilePath( $this->rawPath );
-
- if (
+ if (
dirname( $this->rawPath ) == 'streams'
and isset( self::$sourceStreams[basename( $this->rawPath )] )
) {
@@ -244,10 +241,7 @@ class Stream {
}
- // Avoid problems with .part file extensions
- $this->relPath = Keymanager::fixPartialFilePath( $this->relPath );
-
- // Fetch and decrypt keyfile
+ // Fetch and decrypt keyfile
// Fetch existing keyfile
$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
--
GitLab
From d017bbb065245212e8aa4091f4bee0a4e8ea9055 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 23:24:07 +0200
Subject: [PATCH 100/304] fix share for renamed or moved files
---
apps/files_encryption/lib/proxy.php | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7294c24366..73f72a9e23 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -343,13 +343,13 @@ class Proxy extends \OC_FileProxy {
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView('/');
+ $session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util( $view, $userId );
// Reformat path for use with OC_FSV
$newPathSplit = explode( '/', $newPath );
$newPathRelative = implode( '/', array_slice( $newPathSplit, 3 ) );
- $newPathRelativeToUser = implode( '/', array_slice( $newPathSplit, 2 ) );
// get file info from database/cache
//$newFileInfo = \OC\Files\Filesystem::getFileInfo($newPathRelative);
@@ -386,8 +386,19 @@ class Proxy extends \OC_FileProxy {
$view->putFileInfo( $newPath, $cached );
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
}
+
+
+
\OC_FileProxy::$enabled = $proxyStatus;
return true;
--
GitLab
From 813641e6e86601cc73da0f00d8430da62e872180 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 00:05:20 +0200
Subject: [PATCH 101/304] improved file size created new method fixFileSize in
Util so it can be used with files_trashbin
---
apps/files_encryption/lib/proxy.php | 40 +----------------
apps/files_encryption/lib/util.php | 70 ++++++++++++++++++++++++++---
2 files changed, 66 insertions(+), 44 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 73f72a9e23..24821d8a05 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -351,41 +351,7 @@ class Proxy extends \OC_FileProxy {
$newPathSplit = explode( '/', $newPath );
$newPathRelative = implode( '/', array_slice( $newPathSplit, 3 ) );
- // get file info from database/cache
- //$newFileInfo = \OC\Files\Filesystem::getFileInfo($newPathRelative);
-
- if ($util->isEncryptedPath($newPath)) {
- $cached = $view->getFileInfo($newPath);
- $cached['encrypted'] = 1;
-
- // get the size from filesystem
- $size = $view->filesize($newPath);
-
- // calculate last chunk nr
- $lastChunckNr = floor($size / 8192);
-
- // open stream
- $result = fopen('crypt://' . $newPathRelative, "r");
-
- if(is_resource($result)) {
- // calculate last chunk position
- $lastChunckPos = ($lastChunckNr * 8192);
-
- // seek to end
- fseek($result, $lastChunckPos);
-
- // get the content of the last chunck
- $lastChunkContent = fread($result, 8192);
-
- // calc the real file size with the size of the last chunk
- $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
-
- // set the size
- $cached['unencrypted_size'] = $realSize;
- }
-
- $view->putFileInfo( $newPath, $cached );
-
+ if($util->fixFileSize($newPath)) {
// get sharing app state
$sharingEnabled = \OCP\Share::isEnabled();
@@ -396,13 +362,9 @@ class Proxy extends \OC_FileProxy {
$util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
}
-
-
-
\OC_FileProxy::$enabled = $proxyStatus;
return true;
-
}
public function postFopen( $path, &$result ){
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2198963ce1..9d9e420e4d 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -421,10 +421,10 @@ class Util {
return $text;
}
- /**
- * @brief Check if a given path identifies an encrypted file
- * @return true / false
- */
+ /**
+ * @brief Check if a given path identifies an encrypted file
+ * @return true / false
+ */
public function isEncryptedPath( $path ) {
// Disable encryption proxy so data retreived is in its
@@ -438,7 +438,67 @@ class Util {
return Crypt::isCatfileContent( $data );
}
-
+
+ /**
+ * @brief fix the file size of the encrypted file
+ *
+ * @param $path absolute path
+ * @return true / false if file is encrypted
+ */
+
+ public function fixFileSize($path) {
+ $result = false;
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ if ($this->isEncryptedPath($path)) {
+
+ // Reformat path for use with OC_FSV
+ $pathSplit = explode( '/', $path );
+ $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
+
+ $cached = $this->view->getFileInfo($path);
+ $cached['encrypted'] = 1;
+
+ // get the size from filesystem
+ $size = $this->view->filesize($path);
+
+ // calculate last chunk nr
+ $lastChunckNr = floor($size / 8192);
+
+ // open stream
+ $result = fopen('crypt://' . $pathRelative, "r");
+
+ if(is_resource($result)) {
+ // calculate last chunk position
+ $lastChunckPos = ($lastChunckNr * 8192);
+
+ // seek to end
+ fseek($result, $lastChunckPos);
+
+ // get the content of the last chunk
+ $lastChunkContent = fread($result, 8192);
+
+ // calc the real file size with the size of the last chunk
+ $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
+
+ // set the size
+ $cached['unencrypted_size'] = $realSize;
+ }
+
+ // put file info
+ $this->view->putFileInfo( $path, $cached );
+
+ $result = true;
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+ }
+
/**
* @brief Format a path to be relative to the /user/files/ directory
*/
--
GitLab
From d40ffc5aac2e54da6b94e62094bbd323db818e82 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 20:18:05 +0200
Subject: [PATCH 102/304] added filesystem post rename hook
---
apps/files_encryption/appinfo/app.php | 3 ++
apps/files_encryption/hooks/hooks.php | 66 ++++++++++++++++++++++++++-
2 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index c2de9d0b44..9ae6c8331f 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -23,6 +23,9 @@ OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', '
// Webdav-related hooks
OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
+// filesystem hooks
+OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
$view = new OC_FilesystemView( '/' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2ac74ad6c4..82aae2272a 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -310,5 +310,69 @@ class Hooks {
// we may not need to implement it
}
-
+
+
+ /**
+ * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
+ * @param array with oldpath and newpath
+ *
+ * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+ * of the stored versions along the actual file
+ */
+ public static function postRename($params) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+ $session = new Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+
+ // Format paths to be relative to user files dir
+ $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath'];
+ $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath'];
+
+ // add key ext if this is not an folder
+ if (!$view->is_dir($oldKeyfilePath)) {
+ $oldKeyfilePath .= '.key';
+ $newKeyfilePath .= '.key';
+
+ // handle share-keys
+ $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$params['oldpath']);
+ $matches = glob(preg_quote($localKeyPath).'*.shareKey');
+ foreach ($matches as $src) {
+ $dst = str_replace($params['oldpath'], $params['newpath'], $src);
+ rename($src, $dst);
+ }
+
+ } else {
+ // handle share-keys folders
+ $oldShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath'];
+ $newShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath'];
+ $view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
+ }
+
+ // Rename keyfile so it isn't orphaned
+ if($view->file_exists($oldKeyfilePath)) {
+ $view->rename($oldKeyfilePath, $newKeyfilePath);
+ }
+
+ // build the path to the file
+ $newPath = '/' . $userId . '/files' .$params['newpath'];
+ $newPathRelative = $params['newpath'];
+
+ if($util->fixFileSize($newPath)) {
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
--
GitLab
From 05523b76c0c17a74db6604f2689a9219d318153d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 20:18:57 +0200
Subject: [PATCH 103/304] fix reusing keys fix webdav part files
---
apps/files_encryption/lib/keymanager.php | 76 ++++++++++++++++++++----
1 file changed, 66 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index cfc13ee132..9f3cb8120c 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -129,16 +129,51 @@ class Keymanager {
mkdir($keyfileFolderName, 0750, true);
}
}
-
- $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
+
+ // try reusing key file if part file
+ if(self::isPartialFilePath($targetPath)) {
+ $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile );
+ } else {
+ $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+ }
\OC_FileProxy::$enabled = $proxyStatus;
return $result;
}
-
+
+ /**
+ * @brief Remove .path extension from a file path
+ * @param string $path Path that may identify a .part file
+ * @return string File path without .part extension
+ * @note this is needed for reusing keys
+ */
+ public static function fixPartialFilePath($path)
+ {
+ if (preg_match('/\.part$/', $path)) {
+
+ $newLength = strlen($path) - 5;
+ $fPath = substr($path, 0, $newLength);
+
+ return $fPath;
+ } else {
+
+ return $path;
+
+ }
+
+ }
+
+ public static function isPartialFilePath($path)
+ {
+ if (preg_match('/\.part$/', $path)) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
@@ -150,12 +185,20 @@ class Keymanager {
* of the keyfile must be performed by client code
*/
public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
-
+
+ // try reusing key file if part file
+ if(self::isPartialFilePath($filePath)) {
+ $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
+ if($result) {
+ return $result;
+ }
+ }
+
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
$filePath_f = ltrim( $filename, '/' );
-
- $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -287,7 +330,7 @@ class Keymanager {
*/
public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
- //here we need the currently logged in user, while userId can be a different user
+ //here we need the currently logged in user, while userId can be a different user
$util = new Util( $view, \OCP\User::getUser() );
list($owner, $filename) = $util->getUidAndFilename($path);
@@ -295,8 +338,13 @@ class Keymanager {
$basePath = '/' . $owner . '/files_encryption/share-keys';
$shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
-
- $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+
+ // try reusing key file if part file
+ if(self::isPartialFilePath($shareKeyPath)) {
+ $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+ } else {
+ $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+ }
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -359,6 +407,14 @@ class Keymanager {
*/
public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+ // try reusing key file if part file
+ if(self::isPartialFilePath($filePath)) {
+ $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
+ if($result) {
+ return $result;
+ }
+ }
+
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
--
GitLab
From ba080e0d2e43a24b891aa7d8bb8bcf54ccd5faa4 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 20:21:46 +0200
Subject: [PATCH 104/304] removed preRename and moved postRename to hooks.php
added postWrite and postTouch to fix file size and sharing keys
---
apps/files_encryption/lib/proxy.php | 158 ++++++++++------------------
1 file changed, 58 insertions(+), 100 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 24821d8a05..439aa0da25 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -273,96 +273,20 @@ class Proxy extends \OC_FileProxy {
}
/**
- * @brief When a file is renamed, rename its keyfile also
- * @return bool Result of rename()
- * @note This is pre rather than post because using post didn't work
- */
- public function preRename( $oldPath, $newPath )
- {
-
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView('/');
-
- $userId = \OCP\USER::getUser();
-
- // Format paths to be relative to user files dir
- $oldTrimmed = ltrim($oldPath, '/');
- $oldSplit = explode('/', $oldTrimmed);
- $oldSliced = array_slice($oldSplit, 2);
- $oldRelPath = implode('/', $oldSliced);
- $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath;
-
- $newTrimmed = ltrim($newPath, '/');
- $newSplit = explode('/', $newTrimmed);
- $newSliced = array_slice($newSplit, 2);
- $newRelPath = implode('/', $newSliced);
- $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath;
-
- // add key ext if this is not an folder
- if (!$view->is_dir($oldKeyfilePath)) {
- $oldKeyfilePath .= '.key';
- $newKeyfilePath .= '.key';
-
- // handle share-keys
- $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$oldRelPath);
- $matches = glob(preg_quote($localKeyPath).'*.shareKey');
- foreach ($matches as $src) {
- $dst = str_replace($oldRelPath, $newRelPath, $src);
- rename($src, $dst);
- }
-
- } else {
- // handle share-keys folders
- $oldShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $oldRelPath;
- $newShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $newRelPath;
- $view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
- }
-
- // Rename keyfile so it isn't orphaned
- $result = $view->rename($oldKeyfilePath, $newKeyfilePath);
-
- \OC_FileProxy::$enabled = $proxyStatus;
-
- return $result;
-
- }
-
- /**
* @brief When a file is renamed, rename its keyfile also
* @return bool Result of rename()
* @note This is pre rather than post because using post didn't work
*/
- public function postRename( $oldPath, $newPath )
+ public function postWrite( $path )
{
+ $this->handleFile($path);
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView('/');
- $session = new Session($view);
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
-
- // Reformat path for use with OC_FSV
- $newPathSplit = explode( '/', $newPath );
- $newPathRelative = implode( '/', array_slice( $newPathSplit, 3 ) );
-
- if($util->fixFileSize($newPath)) {
- // get sharing app state
- $sharingEnabled = \OCP\Share::isEnabled();
-
- // get users
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);
-
- // update sharing-keys
- $util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
- }
+ return true;
+ }
- \OC_FileProxy::$enabled = $proxyStatus;
+ public function postTouch( $path )
+ {
+ $this->handleFile($path);
return true;
}
@@ -480,25 +404,28 @@ class Proxy extends \OC_FileProxy {
return $data;
}
- public function postStat( $path, $data ) {
+ public function postStat($path, $data)
+ {
+ // check if file is encrypted
+ if (Crypt::isCatfileContent($path)) {
- if ( Crypt::isCatfileContent( $path ) ) {
-
- $cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
- $data['size'] = $cached['unencrypted_size'];
-
- }
-
- return $data;
- }
+ // get file info from cache
+ $cached = \OC\Files\Filesystem::getFileInfo($path, '');
- public function postFileSize( $path, $size ) {
+ // set the real file size
+ $data['size'] = $cached['unencrypted_size'];
+ }
- $view = new \OC_FilesystemView( '/' );
+ return $data;
+ }
+
+ public function postFileSize($path, $size)
+ {
+
+ $view = new \OC_FilesystemView('/');
// if path is a folder do nothing
- if($view->is_dir($path)) {
+ if ($view->is_dir($path)) {
return $size;
}
@@ -510,10 +437,41 @@ class Proxy extends \OC_FileProxy {
$fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
// if file is encrypted return real file size
- if(is_array($fileInfo) && $fileInfo['encrypted'] == 1) {
+ if (is_array($fileInfo) && $fileInfo['encrypted'] == 1) {
return $fileInfo['unencrypted_size'];
} else {
return $size;
}
- }
-}
+ }
+
+ public function handleFile($path) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
+ $session = new Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+
+ // Reformat path for use with OC_FSV
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
+
+ // only if file is on 'files' folder fix file size and sharing
+ if($path_split[2] == 'files' && $util->fixFileSize($path)) {
+
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path_f);
+
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $path_f);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ }
--
GitLab
From 770aebfb9ed7703010ee2bceca73dee35f660c00 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 20:22:38 +0200
Subject: [PATCH 105/304] check if file exists before fixing file size
---
apps/files_encryption/lib/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 9d9e420e4d..a9996999a3 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -453,7 +453,7 @@ class Util {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if ($this->isEncryptedPath($path)) {
+ if ($this->view->file_exists($path) && $this->isEncryptedPath($path)) {
// Reformat path for use with OC_FSV
$pathSplit = explode( '/', $path );
--
GitLab
From d32bf993fa0d0e1dae6c9e1541bfa9a599ec9b52 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 20:23:30 +0200
Subject: [PATCH 106/304] removed previous added post rename FileProxy hook
---
lib/files/view.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/files/view.php b/lib/files/view.php
index d0fc5910e6..bd4812f8f8 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -362,7 +362,6 @@ class View {
list(, $internalPath2) = Filesystem::resolvePath($absolutePath2 . $postFix2);
if ($storage) {
$result = $storage->rename($internalPath1, $internalPath2);
- \OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
} else {
$result = false;
}
--
GitLab
From 7f1f0464a882dc8df80cc2da79079dad0933ecdd Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 23:02:42 +0200
Subject: [PATCH 107/304] added self healing if file get remove from file cache
---
apps/files_encryption/lib/proxy.php | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 439aa0da25..23290b5b20 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -438,10 +438,24 @@ class Proxy extends \OC_FileProxy {
// if file is encrypted return real file size
if (is_array($fileInfo) && $fileInfo['encrypted'] == 1) {
- return $fileInfo['unencrypted_size'];
+ $size = $fileInfo['unencrypted_size'];
} else {
- return $size;
+ // self healing if file was removed from file cache
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+ $fixSize = $util->getFileSize($path);
+ if($fixSize > 0) {
+ $size = $fixSize;
+
+ $fileInfo['encrypted'] = 1;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info
+ $view->putFileInfo( $path, $fileInfo );
+ }
}
+
+ return $size;
}
public function handleFile($path) {
--
GitLab
From f9760f65212bd6464685ec1dd60a73825b4a3f66 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 27 Apr 2013 23:34:25 +0200
Subject: [PATCH 108/304] improved file size
---
apps/files_encryption/lib/util.php | 59 +++++++++++++++++++++---------
1 file changed, 42 insertions(+), 17 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a9996999a3..fe040d8877 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -440,53 +440,78 @@ class Util {
}
/**
- * @brief fix the file size of the encrypted file
+ * @brief get the file size of the unencrypted file
*
* @param $path absolute path
* @return true / false if file is encrypted
*/
- public function fixFileSize($path) {
- $result = false;
+ public function getFileSize($path) {
+ $result = 0;
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if ($this->view->file_exists($path) && $this->isEncryptedPath($path)) {
-
- // Reformat path for use with OC_FSV
- $pathSplit = explode( '/', $path );
- $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
+ // Reformat path for use with OC_FSV
+ $pathSplit = explode( '/', $path );
+ $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
- $cached = $this->view->getFileInfo($path);
- $cached['encrypted'] = 1;
+ if ($pathSplit[2] == 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
// get the size from filesystem
- $size = $this->view->filesize($path);
+ $fullPath = $this->view->getLocalFile($path);
+ $size = filesize($fullPath);
// calculate last chunk nr
$lastChunckNr = floor($size / 8192);
// open stream
- $result = fopen('crypt://' . $pathRelative, "r");
+ $stream = fopen('crypt://' . $pathRelative, "r");
- if(is_resource($result)) {
+ if(is_resource($stream)) {
// calculate last chunk position
$lastChunckPos = ($lastChunckNr * 8192);
// seek to end
- fseek($result, $lastChunckPos);
+ fseek($stream, $lastChunckPos);
// get the content of the last chunk
- $lastChunkContent = fread($result, 8192);
+ $lastChunkContent = fread($stream, 8192);
// calc the real file size with the size of the last chunk
$realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
- // set the size
- $cached['unencrypted_size'] = $realSize;
+ // store file size
+ $result = $realSize;
}
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ return $result;
+ }
+ /**
+ * @brief fix the file size of the encrypted file
+ *
+ * @param $path absolute path
+ * @return true / false if file is encrypted
+ */
+
+ public function fixFileSize($path) {
+ $result = false;
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $realSize = $this->getFileSize($path);
+ if($realSize > 0) {
+ $cached = $this->view->getFileInfo($path);
+ $cached['encrypted'] = 1;
+
+ // set the size
+ $cached['unencrypted_size'] = $realSize;
// put file info
$this->view->putFileInfo( $path, $cached );
--
GitLab
From 4a63faf64b14b21af7cb73f43ca3fcf841aff804 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 29 Apr 2013 01:43:59 +0200
Subject: [PATCH 109/304] speed improvement
---
apps/files_encryption/lib/stream.php | 65 +++++++++++++++++-----------
1 file changed, 39 insertions(+), 26 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 411bcdac92..a51f2c56d9 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -298,7 +298,8 @@ class Stream {
// automatically attempted when the file is written to disk -
// we are handling that separately here and we don't want to
// get into an infinite loop
- //\OC_FileProxy::$enabled = false;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
// Get the length of the unencrypted data that we are handling
$length = strlen( $data );
@@ -322,30 +323,7 @@ class Stream {
}
- // Fetch user's public key
- $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
-
- // Check if OC sharing api is enabled
- $sharingEnabled = \OCP\Share::isEnabled();
-
- $util = new Util( $this->rootView, $this->userId );
-
- // Get all users sharing the file includes current user
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId);
-
- // Fetch public keys for all sharing users
- $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
- // Encrypt enc key for all sharing users
- $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
-
- $view = new \OC_FilesystemView( '/' );
-
- // Save the new encrypted file key
- Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
-
- // Save the sharekeys
- Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
@@ -437,6 +415,8 @@ class Stream {
$this->size = max( $this->size, $pointer + $length );
$this->unencryptedSize += $length;
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $length;
}
@@ -492,13 +472,46 @@ class Stream {
}
public function stream_close() {
-
- $this->flush();
+
+ $this->flush();
if (
$this->meta['mode']!='r'
and $this->meta['mode']!='rb'
) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Fetch user's public key
+ $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+
+ // Check if OC sharing api is enabled
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ $util = new Util( $this->rootView, $this->userId );
+
+ // Get all users sharing the file includes current user
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId);
+
+ // Fetch public keys for all sharing users
+ $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+
+ // Encrypt enc key for all sharing users
+ $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
+
+ $view = new \OC_FilesystemView( '/' );
+
+ // Save the new encrypted file key
+ Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
+
+ // Save the sharekeys
+ Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
\OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => 1, 'size' => $this->size, 'unencrypted_size' => $this->unencryptedSize ), '' );
}
--
GitLab
From 4ecd62e58d6caf8da3b6e1a14114fec49784a622 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 29 Apr 2013 09:12:43 +0200
Subject: [PATCH 110/304] improvements for test
testSymmetricStreamEncryptShortFileContent this runs currently into an
infinite loop
---
apps/files_encryption/test/crypt.php | 66 ++++++++++++++++------------
1 file changed, 37 insertions(+), 29 deletions(-)
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
index b02e63b2ff..9c5e43e242 100755
--- a/apps/files_encryption/test/crypt.php
+++ b/apps/files_encryption/test/crypt.php
@@ -52,14 +52,19 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
\OC_User::setUserId( 'admin' );
$this->userId = 'admin';
$this->pass = 'admin';
-
- \OC_Filesystem::init( '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-
+
+ $userHome = \OC_User::getHome($this->userId);
+ if(!file_exists($userHome)) {
+ mkdir($userHome, 0777, true);
+ }
+ $dataDir = str_replace('/'.$this->userId, '', $userHome);
+
+ \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $dataDir), '/' );
+ \OC\Files\Filesystem::init($this->userId, '/');
}
function tearDown() {
-
+
}
function testGenerateKey() {
@@ -222,35 +227,38 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
function testSymmetricStreamEncryptShortFileContent() {
- $filename = 'tmp-'.time();
-
+ $filename = 'tmp-'.time().'.test';
+
$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $absolutePath = \OC\Files\Filesystem::getLocalFile($this->userId . '/files/' . $filename);
+ $retreivedCryptedFile = file_get_contents($absolutePath);
+
// Check that the file was encrypted before being written to disk
$this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
-
- // Get private key
- $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-
-
- // Get keyfile
- $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-
- $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-
-
- // Manually decrypt
- $manualDecrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $retreivedCryptedFile, $decryptedKeyfile );
-
+
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey( $this->view, $this->userId, $filename );
+
+ // get session
+ $session = new Encryption\Session( $this->view );
+
+ // get private key
+ $privateKey = $session->getPrivateKey( $this->userId );
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
+ // Manually decrypt
+ $manualDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $retreivedCryptedFile, $plainKeyfile );
+
// Check that decrypted data matches
$this->assertEquals( $this->dataShort, $manualDecrypt );
@@ -329,7 +337,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->view->unlink( $filename );
- Encryption\Keymanager::deleteFileKey( $filename );
+ Encryption\Keymanager::deleteFileKey( $this->view, $this->userId, $filename );
}
--
GitLab
From c52fe1253728dde2b85521df3fce4c461741bcc3 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 29 Apr 2013 23:37:08 +0200
Subject: [PATCH 111/304] fixed missing parameter
---
apps/files_encryption/hooks/hooks.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 82aae2272a..25c2d091c4 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -119,8 +119,10 @@ class Hooks {
// is in use (client-side encryption does not have access to
// the necessary keys)
if ( Crypt::mode() == 'server' ) {
-
- $session = new Session();
+
+ $view = new \OC_FilesystemView( '/' );
+
+ $session = new Session($view);
// Get existing decrypted private key
$privateKey = $session->getPrivateKey();
--
GitLab
From d22795d68b4937bc6dba6d742b0f7b503cb32228 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 29 Apr 2013 23:41:49 +0200
Subject: [PATCH 112/304] fixed test for crypt and keymanager disabled
encryption file proxy in test/lib/cache/file.php
---
apps/files_encryption/test/crypt.php | 87 +++++++++++++----------
apps/files_encryption/test/keymanager.php | 37 ++++++----
tests/lib/cache/file.php | 7 +-
3 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
index 9c5e43e242..7f9572f426 100755
--- a/apps/files_encryption/test/crypt.php
+++ b/apps/files_encryption/test/crypt.php
@@ -34,7 +34,9 @@ use OCA\Encryption;
class Test_Crypt extends \PHPUnit_Framework_TestCase {
function setUp() {
-
+ // reset backend
+ \OC_User::useBackend('database');
+
// set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
$this->dataShort = 'hats';
@@ -54,13 +56,10 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->pass = 'admin';
$userHome = \OC_User::getHome($this->userId);
- if(!file_exists($userHome)) {
- mkdir($userHome, 0777, true);
- }
- $dataDir = str_replace('/'.$this->userId, '', $userHome);
+ $this->dataDir = str_replace('/'.$this->userId, '', $userHome);
- \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $dataDir), '/' );
\OC\Files\Filesystem::init($this->userId, '/');
+ \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
}
function tearDown() {
@@ -225,7 +224,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
//
// }
- function testSymmetricStreamEncryptShortFileContent() {
+ function testSymmetricStreamEncryptShortFileContent() {
$filename = 'tmp-'.time().'.test';
@@ -234,9 +233,15 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
// Get file contents without using any wrapper to get it's actual contents on disk
- $absolutePath = \OC\Files\Filesystem::getLocalFile($this->userId . '/files/' . $filename);
- $retreivedCryptedFile = file_get_contents($absolutePath);
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
// Check that the file was encrypted before being written to disk
$this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
@@ -261,7 +266,11 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Check that decrypted data matches
$this->assertEquals( $this->dataShort, $manualDecrypt );
-
+
+ // Teardown
+ $this->view->unlink( $filename );
+
+ Encryption\Keymanager::deleteFileKey( $this->view, $this->userId, $filename );
}
/**
@@ -273,7 +282,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
function testSymmetricStreamEncryptLongFileContent() {
// Generate a a random filename
- $filename = 'tmp-'.time();
+ $filename = 'tmp-'.time().'.test';
// Save long data as encrypted file using stream wrapper
$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
@@ -281,12 +290,18 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
-// echo "\n\n\$retreivedCryptedFile = $retreivedCryptedFile\n\n";
-
- // Check that the file was encrypted before being written to disk
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+
+ // Check that the file was encrypted before being written to disk
$this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
// Manuallly split saved file into separate IVs and encrypted chunks
@@ -298,39 +313,35 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
//print_r($e);
-
-
- // Get private key
- $encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
- $decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-
-
- // Get keyfile
- $encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-
- $decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-
-
+
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey( $this->view, $this->userId, $filename );
+
+ // get session
+ $session = new Encryption\Session( $this->view );
+
+ // get private key
+ $privateKey = $session->getPrivateKey( $this->userId );
+
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+
// Set var for reassembling decrypted content
$decrypt = '';
// Manually decrypt chunk
foreach ($e as $e) {
-
-// echo "\n\$e = $e";
- $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $decryptedKeyfile );
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $plainKeyfile );
// Assemble decrypted chunks
$decrypt .= $chunkDecrypt;
-// echo "\n\$chunkDecrypt = $chunkDecrypt";
-
}
-// echo "\n\$decrypt = $decrypt";
-
$this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
// Teardown
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/test/keymanager.php
index bf453fe316..3dba6d0df9 100644
--- a/apps/files_encryption/test/keymanager.php
+++ b/apps/files_encryption/test/keymanager.php
@@ -24,7 +24,9 @@ use OCA\Encryption;
class Test_Keymanager extends \PHPUnit_Framework_TestCase {
function setUp() {
-
+ // reset backend
+ \OC_User::useBackend('database');
+
\OC_FileProxy::$enabled = false;
// set content for encrypting / decrypting in tests
@@ -44,9 +46,12 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC_User::setUserId( 'admin' );
$this->userId = 'admin';
$this->pass = 'admin';
-
- \OC_Filesystem::init( '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
+
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/'.$this->userId, '', $userHome);
+
+ \OC_Filesystem::init( $this->userId, '/' );
+ \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
}
@@ -61,7 +66,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
// Will this length vary? Perhaps we should use a range instead
- $this->assertEquals( 2296, strlen( $key ) );
+ $this->assertEquals( 4388, strlen( $key ) );
}
@@ -69,7 +74,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
- $this->assertEquals( 451, strlen( $key ) );
+ $this->assertEquals( 800, strlen( $key ) );
$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
}
@@ -81,11 +86,19 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$key = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->randomKey, 'hat' );
- $path = 'unittest-'.time().'txt';
-
+ $file = 'unittest-'.time().'.txt';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
-
- Encryption\Keymanager::setFileKey( $this->view, $path, $this->userId, $key['key'] );
+ Encryption\Keymanager::setFileKey( $this->view, $file, $this->userId, $key['key'] );
}
@@ -109,9 +122,9 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
- $this->assertEquals( 451, strlen( $keys['publicKey'] ) );
+ $this->assertEquals( 800, strlen( $keys['publicKey'] ) );
$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
- $this->assertEquals( 2296, strlen( $keys['privateKey'] ) );
+ $this->assertEquals( 4388, strlen( $keys['privateKey'] ) );
}
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 5dcd326880..d113f90768 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -33,9 +33,10 @@ class Test_Cache_File extends Test_Cache {
OC_Hook::clear('OC_Filesystem');
//enable only the encryption hook if needed
- if(OC_App::isEnabled('files_encryption')) {
- OC_FileProxy::register(new OC_FileProxy_Encryption());
- }
+ //not used right now
+ //if(OC_App::isEnabled('files_encryption')) {
+ // OC_FileProxy::register(new OCA\Encryption\Proxy());
+ //}
//set up temporary storage
\OC\Files\Filesystem::clearMounts();
--
GitLab
From 882a747b47371ab9d71ba6c336a873873805c696 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 30 Apr 2013 00:34:05 +0200
Subject: [PATCH 113/304] rename folder to tests
---
apps/files_encryption/{test => tests}/binary | Bin
apps/files_encryption/{test => tests}/crypt.php | 0
.../files_encryption/{test => tests}/keymanager.php | 0
.../{test => tests}/legacy-encrypted-text.txt | Bin
apps/files_encryption/{test => tests}/proxy.php | 0
apps/files_encryption/{test => tests}/stream.php | 0
apps/files_encryption/{test => tests}/util.php | 0
apps/files_encryption/{test => tests}/zeros | Bin
8 files changed, 0 insertions(+), 0 deletions(-)
rename apps/files_encryption/{test => tests}/binary (100%)
rename apps/files_encryption/{test => tests}/crypt.php (100%)
rename apps/files_encryption/{test => tests}/keymanager.php (100%)
rename apps/files_encryption/{test => tests}/legacy-encrypted-text.txt (100%)
rename apps/files_encryption/{test => tests}/proxy.php (100%)
rename apps/files_encryption/{test => tests}/stream.php (100%)
rename apps/files_encryption/{test => tests}/util.php (100%)
rename apps/files_encryption/{test => tests}/zeros (100%)
diff --git a/apps/files_encryption/test/binary b/apps/files_encryption/tests/binary
similarity index 100%
rename from apps/files_encryption/test/binary
rename to apps/files_encryption/tests/binary
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/tests/crypt.php
similarity index 100%
rename from apps/files_encryption/test/crypt.php
rename to apps/files_encryption/tests/crypt.php
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/tests/keymanager.php
similarity index 100%
rename from apps/files_encryption/test/keymanager.php
rename to apps/files_encryption/tests/keymanager.php
diff --git a/apps/files_encryption/test/legacy-encrypted-text.txt b/apps/files_encryption/tests/legacy-encrypted-text.txt
similarity index 100%
rename from apps/files_encryption/test/legacy-encrypted-text.txt
rename to apps/files_encryption/tests/legacy-encrypted-text.txt
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/tests/proxy.php
similarity index 100%
rename from apps/files_encryption/test/proxy.php
rename to apps/files_encryption/tests/proxy.php
diff --git a/apps/files_encryption/test/stream.php b/apps/files_encryption/tests/stream.php
similarity index 100%
rename from apps/files_encryption/test/stream.php
rename to apps/files_encryption/tests/stream.php
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/tests/util.php
similarity index 100%
rename from apps/files_encryption/test/util.php
rename to apps/files_encryption/tests/util.php
diff --git a/apps/files_encryption/test/zeros b/apps/files_encryption/tests/zeros
similarity index 100%
rename from apps/files_encryption/test/zeros
rename to apps/files_encryption/tests/zeros
--
GitLab
From 27ce7845b4205650e50f3777d8b152470440cbe6 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 30 Apr 2013 01:35:46 +0200
Subject: [PATCH 114/304] fixed tests, now tests should work via autotest.sh
files_encryption app is now enabled in enable_all.php
---
apps/files_encryption/lib/util.php | 7 ++-
apps/files_encryption/tests/keymanager.php | 4 +-
apps/files_encryption/tests/util.php | 61 +++++++++++++++-------
tests/enable_all.php | 1 +
4 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index fe040d8877..4097250b25 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -204,7 +204,12 @@ class Util {
$this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
-
+
+ // create database configuration
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery`) VALUES (?,?,?)';
+ $args = array( $this->userId, 'server-side', 0);
+ $query = \OCP\DB::prepare( $sql );
+ $query->execute( $args );
}
return true;
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 3dba6d0df9..7fe37838a4 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -50,8 +50,8 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/'.$this->userId, '', $userHome);
- \OC_Filesystem::init( $this->userId, '/' );
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+ \OC\Files\Filesystem::init( $this->userId, '/' );
+ \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
}
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 3ebc484809..0659b468a3 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -29,19 +29,20 @@ use OCA\Encryption;
class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function setUp() {
-
- \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-
- // set content for encrypting / decrypting in tests
+ // reset backend
+ \OC_User::useBackend('database');
+
+ \OC_User::setUserId( 'admin' );
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // set content for encrypting / decrypting in tests
$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
$this->dataShort = 'hats';
$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
-
- $this->userId = 'admin';
- $this->pass = 'admin';
-
+
$keypair = Encryption\Crypt::createKeypair();
$this->genPublicKey = $keypair['publicKey'];
@@ -54,9 +55,15 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
$this->view = new \OC_FilesystemView( '/' );
-
- $this->mockView = m::mock('OC_FilesystemView');
- $this->util = new Encryption\Util( $this->mockView, $this->userId );
+
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/'.$this->userId, '', $userHome);
+
+ \OC\Files\Filesystem::init( $this->userId, '/' );
+ \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+
+ $mockView = m::mock('OC_FilesystemView');
+ $this->util = new Encryption\Util( $mockView, $this->userId );
}
@@ -90,8 +97,8 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$mockView = m::mock('OC_FilesystemView');
- $mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( false );
- $mockView->shouldReceive( 'mkdir' )->times(4)->andReturn( true );
+ $mockView->shouldReceive( 'file_exists' )->times(7)->andReturn( false );
+ $mockView->shouldReceive( 'mkdir' )->times(6)->andReturn( true );
$mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
$util = new Encryption\Util( $mockView, $this->userId );
@@ -107,7 +114,7 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$mockView = m::mock('OC_FilesystemView');
- $mockView->shouldReceive( 'file_exists' )->times(6)->andReturn( true );
+ $mockView->shouldReceive( 'file_exists' )->times(8)->andReturn( true );
$mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
$util = new Encryption\Util( $mockView, $this->userId );
@@ -141,7 +148,7 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$mockView = m::mock('OC_FilesystemView');
- $mockView->shouldReceive( 'file_exists' )->times(3)->andReturn( true );
+ $mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( true );
$util = new Encryption\Util( $mockView, $this->userId );
@@ -190,11 +197,25 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function testGetUidAndFilename() {
\OC_User::setUserId( 'admin' );
-
- $this->util->getUidAndFilename( 'test1.txt' );
-
-
-
+
+ $filename = 'tmp-'.time().'.test';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $util = new Encryption\Util( $this->view, $this->userId );
+
+ list($fileOwnerUid, $file) = $util->getUidAndFilename( $filename );
+
+ $this->assertEquals('admin', $fileOwnerUid);
+
+ $this->assertEquals($file, $filename);
}
// /**
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 44af011565..111ed0e135 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -8,6 +8,7 @@
require_once __DIR__.'/../lib/base.php';
+OC_App::enable('files_encryption');
OC_App::enable('calendar');
OC_App::enable('contacts');
OC_App::enable('apptemplateadvanced');
--
GitLab
From b1c4464eda73d0c6674a1635c7f8c8629414ecaa Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 30 Apr 2013 01:54:19 +0200
Subject: [PATCH 115/304] improved key length tests
---
apps/files_encryption/tests/keymanager.php | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 7fe37838a4..81034be54b 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -64,9 +64,13 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
function testGetPrivateKey() {
$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->pass);
+
// Will this length vary? Perhaps we should use a range instead
- $this->assertEquals( 4388, strlen( $key ) );
+ $this->assertGreaterThan( 27, strlen( $privateKey ) );
+
+ $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $privateKey, 0, 27 ) );
}
@@ -74,7 +78,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
- $this->assertEquals( 800, strlen( $key ) );
+ $this->assertGreaterThan( 26, strlen( $key ) );
$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
}
@@ -122,9 +126,15 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
- $this->assertEquals( 800, strlen( $keys['publicKey'] ) );
+ $this->assertGreaterThan( 26, strlen( $keys['publicKey'] ) );
+
$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
- $this->assertEquals( 4388, strlen( $keys['privateKey'] ) );
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $keys['privateKey'], $this->pass);
+
+ $this->assertGreaterThan( 27, strlen( $keys['privateKey'] ) );
+
+ $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $privateKey, 0, 27 ) );
}
--
GitLab
From fbbc76f281f50afa3072d99e4e0d413df835b3d3 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 30 Apr 2013 20:44:42 +0200
Subject: [PATCH 116/304] fix for sharing files
---
apps/files_encryption/lib/proxy.php | 33 +++++++++++++++--------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 23290b5b20..50f30594b4 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -153,9 +153,9 @@ class Proxy extends \OC_FileProxy {
$data = $encData;
// Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
-
- // Re-enable proxy - our work is done
+ \OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted'=>true, 'size' => strlen($size), 'unencrypted_size' => $size), '' );
+
+ // Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
}
@@ -437,24 +437,25 @@ class Proxy extends \OC_FileProxy {
$fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
// if file is encrypted return real file size
- if (is_array($fileInfo) && $fileInfo['encrypted'] == 1) {
+ if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
$size = $fileInfo['unencrypted_size'];
} else {
// self healing if file was removed from file cache
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
- $fixSize = $util->getFileSize($path);
- if($fixSize > 0) {
- $size = $fixSize;
-
- $fileInfo['encrypted'] = 1;
- $fileInfo['unencrypted_size'] = $size;
-
- // put file info
- $view->putFileInfo( $path, $fileInfo );
+ if(is_array($fileInfo)) {
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId );
+ $fixSize = $util->getFileSize($path);
+ if($fixSize > 0) {
+ $size = $fixSize;
+
+ $fileInfo['encrypted'] = 1;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info
+ $view->putFileInfo( $path_f, $fileInfo );
+ }
}
}
-
return $size;
}
--
GitLab
From b08179d406cf5af76291bba2edf81b9563a46f44 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 30 Apr 2013 23:58:53 +0200
Subject: [PATCH 117/304] fixed tests after merge against master
---
apps/files_encryption/tests/crypt.php | 9 ++++++---
apps/files_encryption/tests/keymanager.php | 7 +++++--
apps/files_encryption/tests/stream.php | 2 +-
apps/files_encryption/tests/util.php | 9 +++++++--
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 7f9572f426..4a85048ba4 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -21,7 +21,6 @@ use OCA\Encryption;
// This has to go here because otherwise session errors arise, and the private
// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
/**
* @note It would be better to use Mockery here for mocking out the session
@@ -37,7 +36,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// reset backend
\OC_User::useBackend('database');
- // set content for encrypting / decrypting in tests
+ // set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
$this->dataShort = 'hats';
$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
@@ -60,13 +59,17 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init($this->userId, '/');
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
}
function tearDown() {
}
- function testGenerateKey() {
+ function testGenerateKey() {
# TODO: use more accurate (larger) string length for test confirmation
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 81034be54b..33ca29997b 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -19,7 +19,7 @@ use OCA\Encryption;
// This has to go here because otherwise session errors arise, and the private
// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
+//\OC_User::login( 'admin', 'admin' );
class Test_Keymanager extends \PHPUnit_Framework_TestCase {
@@ -52,7 +52,10 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init( $this->userId, '/' );
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
-
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
}
function tearDown(){
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index ba82ac80ea..633cc9e4fc 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -1,4 +1,4 @@
-// <?php
+<?php
// /**
// * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
// * This file is licensed under the Affero General Public License version 3 or
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 0659b468a3..e3ec0860fa 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -24,8 +24,6 @@ $loader->register();
use \Mockery as m;
use OCA\Encryption;
-\OC_User::login( 'admin', 'admin' );
-
class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function setUp() {
@@ -62,6 +60,10 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init( $this->userId, '/' );
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+
$mockView = m::mock('OC_FilesystemView');
$this->util = new Encryption\Util( $mockView, $this->userId );
@@ -75,6 +77,9 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
/**
* @brief test that paths set during User construction are correct
+ *
+ *
+ *
*/
function testKeyPaths() {
--
GitLab
From 5deba29bdfedc3ee2babece9eafff0bb709cd90c Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 1 May 2013 00:09:55 +0200
Subject: [PATCH 118/304] fixed public-keys mount point error
---
apps/files_encryption/hooks/hooks.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 25c2d091c4..e27054f0ec 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -45,7 +45,12 @@ class Hooks {
$view = new \OC_FilesystemView( '/' );
- $util = new Util( $view, $params['uid'] );
+ $userHome = \OC_User::getHome($params['uid']);
+ $dataDir = str_replace('/'.$params['uid'], '', $userHome);
+
+ \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $dataDir .'/public-keys'), '/public-keys/' );
+
+ $util = new Util( $view, $params['uid'] );
// Check files_encryption infrastructure is ready for action
if ( ! $util->ready() ) {
--
GitLab
From 3c100af1329c1c101f38f23f2d74710954387fdf Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 1 May 2013 01:38:06 +0200
Subject: [PATCH 119/304] revert changes to
fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable
right now
---
apps/files/js/files.js | 5 -
apps/files/l10n/ar.php | 6 +-
apps/files/l10n/bg_BG.php | 8 +-
apps/files/l10n/bn_BD.php | 15 +-
apps/files/l10n/ca.php | 16 +-
apps/files/l10n/cs_CZ.php | 8 +-
apps/files/l10n/da.php | 17 +-
apps/files/l10n/de.php | 21 +-
apps/files/l10n/de_DE.php | 11 +-
apps/files/l10n/el.php | 6 +-
apps/files/l10n/eo.php | 11 +-
apps/files/l10n/es.php | 18 +-
apps/files/l10n/es_AR.php | 14 +-
apps/files/l10n/et_EE.php | 6 +-
apps/files/l10n/eu.php | 13 +-
apps/files/l10n/fa.php | 23 +-
apps/files/l10n/fi_FI.php | 10 +-
apps/files/l10n/fr.php | 16 +-
apps/files/l10n/gl.php | 10 +-
apps/files/l10n/he.php | 10 +-
apps/files/l10n/hr.php | 22 +-
apps/files/l10n/hu_HU.php | 4 +-
apps/files/l10n/ia.php | 2 +-
apps/files/l10n/id.php | 6 +-
apps/files/l10n/it.php | 12 +-
apps/files/l10n/ja_JP.php | 14 +-
apps/files/l10n/ka_GE.php | 2 +-
apps/files/l10n/ko.php | 18 +-
apps/files/l10n/lb.php | 4 +-
apps/files/l10n/lt_LT.php | 8 +-
apps/files/l10n/lv.php | 4 +-
apps/files/l10n/mk.php | 10 +-
apps/files/l10n/ms_MY.php | 17 +-
apps/files/l10n/nb_NO.php | 13 +-
apps/files/l10n/nl.php | 28 +-
apps/files/l10n/nn_NO.php | 53 +--
apps/files/l10n/oc.php | 3 +-
apps/files/l10n/pl.php | 14 +-
apps/files/l10n/pt_BR.php | 14 +-
apps/files/l10n/pt_PT.php | 20 +-
apps/files/l10n/ro.php | 24 +-
apps/files/l10n/ru.php | 19 +-
apps/files/l10n/si_LK.php | 13 +-
apps/files/l10n/sk_SK.php | 24 +-
apps/files/l10n/sl.php | 17 +-
apps/files/l10n/sr.php | 2 +-
apps/files/l10n/sv.php | 11 +-
apps/files/l10n/ta_LK.php | 5 +-
apps/files/l10n/th_TH.php | 17 +-
apps/files/l10n/tr.php | 14 +-
apps/files/l10n/uk.php | 4 +-
apps/files/l10n/ur_PK.php | 3 +-
apps/files/l10n/vi.php | 15 +-
apps/files/l10n/zh_CN.GB2312.php | 21 +-
apps/files/l10n/zh_CN.php | 14 +-
apps/files/templates/index.php | 3 +-
apps/files_encryption/hooks/hooks.php | 7 +-
apps/files_encryption/l10n/ca.php | 2 +-
apps/files_encryption/l10n/de.php | 2 +-
apps/files_encryption/l10n/de_DE.php | 2 +-
apps/files_encryption/l10n/el.php | 2 +-
apps/files_encryption/l10n/eu.php | 2 +-
apps/files_encryption/l10n/it.php | 2 +-
apps/files_encryption/l10n/pl.php | 2 +-
apps/files_encryption/l10n/pt_BR.php | 2 +-
apps/files_encryption/l10n/ru.php | 2 +-
apps/files_encryption/l10n/sk_SK.php | 2 +-
apps/files_encryption/l10n/th_TH.php | 2 +-
apps/files_encryption/l10n/vi.php | 2 +-
apps/files_encryption/tests/crypt.php | 9 +-
apps/files_encryption/tests/keymanager.php | 7 +-
apps/files_encryption/tests/stream.php | 2 +-
apps/files_encryption/tests/util.php | 9 +-
apps/files_external/l10n/ar.php | 2 +-
apps/files_external/l10n/bn_BD.php | 2 +-
apps/files_external/l10n/ca.php | 2 +-
apps/files_external/l10n/de.php | 1 -
apps/files_external/l10n/de_DE.php | 1 -
apps/files_external/l10n/el.php | 1 -
apps/files_external/l10n/es.php | 2 +-
apps/files_external/l10n/et_EE.php | 3 +-
apps/files_external/l10n/fr.php | 1 -
apps/files_external/l10n/lb.php | 1 -
apps/files_external/l10n/nl.php | 1 -
apps/files_external/l10n/pt_BR.php | 3 +-
apps/files_external/l10n/ro.php | 3 -
apps/files_external/l10n/ru.php | 1 -
apps/files_external/l10n/sk_SK.php | 3 +-
apps/files_external/l10n/sl.php | 5 +-
apps/files_external/l10n/zh_TW.php | 20 +-
apps/files_sharing/l10n/bn_BD.php | 2 +-
apps/files_sharing/l10n/de_DE.php | 4 +-
apps/files_sharing/l10n/he.php | 2 +-
apps/files_sharing/l10n/hi.php | 3 -
apps/files_sharing/l10n/hr.php | 6 -
apps/files_sharing/l10n/hy.php | 4 -
apps/files_sharing/l10n/ia.php | 6 -
apps/files_sharing/l10n/ku_IQ.php | 2 +-
apps/files_sharing/l10n/lb.php | 5 +-
apps/files_sharing/l10n/lt_LT.php | 8 +-
apps/files_sharing/l10n/lv.php | 2 +-
apps/files_sharing/l10n/ms_MY.php | 6 -
apps/files_sharing/l10n/nn_NO.php | 6 -
apps/files_sharing/l10n/oc.php | 6 -
apps/files_sharing/l10n/pt_BR.php | 2 +-
apps/files_sharing/l10n/si_LK.php | 4 +-
apps/files_sharing/l10n/sk_SK.php | 2 +-
apps/files_sharing/l10n/sr.php | 3 +-
apps/files_sharing/l10n/sr@latin.php | 5 -
apps/files_sharing/l10n/tr.php | 2 +-
apps/files_sharing/l10n/uk.php | 2 +-
apps/files_sharing/l10n/zh_TW.php | 6 +-
apps/files_sharing/lib/cache.php | 2 +-
apps/files_sharing/lib/sharedstorage.php | 2 +-
apps/files_trashbin/l10n/id.php | 8 +-
apps/files_trashbin/l10n/nn_NO.php | 5 -
apps/files_trashbin/l10n/pl.php | 4 +-
apps/files_trashbin/l10n/pt_PT.php | 2 +-
apps/files_trashbin/l10n/ro.php | 1 -
apps/files_trashbin/l10n/sk_SK.php | 2 +-
apps/files_trashbin/lib/trash.php | 395 ++++-------------
apps/files_versions/l10n/et_EE.php | 2 +-
apps/files_versions/l10n/he.php | 4 +-
apps/files_versions/l10n/ku_IQ.php | 4 +-
apps/files_versions/l10n/nb_NO.php | 4 +-
apps/files_versions/l10n/ro.php | 12 +-
apps/files_versions/l10n/si_LK.php | 4 +-
apps/files_versions/l10n/ta_LK.php | 4 +-
apps/files_versions/l10n/th_TH.php | 4 +-
apps/files_versions/l10n/vi.php | 1 -
apps/user_ldap/l10n/ca.php | 2 +-
apps/user_ldap/l10n/fa.php | 2 +-
apps/user_ldap/l10n/gl.php | 2 +-
apps/user_ldap/l10n/hi.php | 1 -
apps/user_ldap/l10n/hr.php | 1 -
apps/user_ldap/l10n/ia.php | 1 -
apps/user_ldap/l10n/id.php | 8 +-
apps/user_ldap/l10n/ku_IQ.php | 1 -
apps/user_ldap/l10n/ms_MY.php | 1 -
apps/user_ldap/l10n/nn_NO.php | 1 -
apps/user_ldap/l10n/oc.php | 1 -
apps/user_ldap/l10n/pl.php | 2 +-
apps/user_ldap/l10n/pt_PT.php | 2 +-
apps/user_ldap/l10n/sr@latin.php | 1 -
apps/user_ldap/l10n/tr.php | 21 -
core/css/styles.css | 6 +-
core/js/jquery-showpassword.js | 14 +-
core/l10n/ar.php | 20 +-
core/l10n/bg_BG.php | 51 +--
core/l10n/bn_BD.php | 16 +-
core/l10n/ca.php | 6 +-
core/l10n/cs_CZ.php | 6 +-
core/l10n/cy_GB.php | 2 +
core/l10n/da.php | 6 +-
core/l10n/de.php | 10 +-
core/l10n/de_DE.php | 12 +-
core/l10n/el.php | 8 +-
core/l10n/eo.php | 3 +-
core/l10n/es.php | 12 +-
core/l10n/es_AR.php | 40 +-
core/l10n/et_EE.php | 13 +-
core/l10n/eu.php | 4 +-
core/l10n/fa.php | 18 +-
core/l10n/fi_FI.php | 45 +-
core/l10n/fr.php | 10 +-
core/l10n/gl.php | 14 +-
core/l10n/he.php | 8 +-
core/l10n/hr.php | 6 +-
core/l10n/hu_HU.php | 8 +-
core/l10n/hy.php | 21 -
core/l10n/id.php | 10 +-
core/l10n/is.php | 14 +-
core/l10n/it.php | 12 +-
core/l10n/ja_JP.php | 10 +-
core/l10n/ka_GE.php | 14 +-
core/l10n/ko.php | 14 +-
core/l10n/lb.php | 2 +-
core/l10n/lt_LT.php | 2 +-
core/l10n/lv.php | 8 +-
core/l10n/mk.php | 6 +-
core/l10n/ms_MY.php | 4 +-
core/l10n/nb_NO.php | 2 +-
core/l10n/nl.php | 12 +-
core/l10n/nn_NO.php | 96 +---
core/l10n/oc.php | 28 +-
core/l10n/pl.php | 4 +-
core/l10n/pt_BR.php | 12 +-
core/l10n/pt_PT.php | 14 +-
core/l10n/ro.php | 23 +-
core/l10n/ru.php | 14 +-
core/l10n/ru_RU.php | 136 +++++-
core/l10n/si_LK.php | 13 +-
core/l10n/sk_SK.php | 14 +-
core/l10n/sl.php | 10 +-
core/l10n/sq.php | 6 +-
core/l10n/sr.php | 14 +-
core/l10n/sr@latin.php | 2 +-
core/l10n/sv.php | 6 +-
core/l10n/ta_LK.php | 16 +-
core/l10n/th_TH.php | 10 +-
core/l10n/tr.php | 6 +-
core/l10n/uk.php | 8 +-
core/l10n/vi.php | 14 +-
core/l10n/zh_CN.GB2312.php | 14 +-
core/l10n/zh_CN.php | 12 +-
core/l10n/zh_HK.php | 2 +
core/l10n/zh_TW.php | 8 +-
core/lostpassword/templates/lostpassword.php | 31 +-
core/templates/layout.user.php | 3 -
l10n/.tx/config | 3 -
l10n/af_ZA/core.po | 73 ++-
l10n/af_ZA/files.po | 14 +-
l10n/af_ZA/files_encryption.po | 4 +-
l10n/af_ZA/files_external.po | 15 +-
l10n/af_ZA/files_sharing.po | 4 +-
l10n/af_ZA/files_trashbin.po | 4 +-
l10n/af_ZA/files_versions.po | 4 +-
l10n/af_ZA/lib.po | 55 ++-
l10n/af_ZA/settings.po | 80 ++--
l10n/af_ZA/user_ldap.po | 4 +-
l10n/ar/core.po | 96 ++--
l10n/ar/files.po | 22 +-
l10n/ar/files_encryption.po | 6 +-
l10n/ar/files_external.po | 17 +-
l10n/ar/files_sharing.po | 5 +-
l10n/ar/files_trashbin.po | 5 +-
l10n/ar/files_versions.po | 5 +-
l10n/ar/lib.po | 58 ++-
l10n/ar/settings.po | 95 ++--
l10n/ar/user_ldap.po | 4 +-
l10n/be/core.po | 69 ++-
l10n/be/files.po | 14 +-
l10n/be/files_encryption.po | 4 +-
l10n/be/files_external.po | 15 +-
l10n/be/files_sharing.po | 4 +-
l10n/be/files_trashbin.po | 4 +-
l10n/be/files_versions.po | 4 +-
l10n/be/lib.po | 55 ++-
l10n/be/settings.po | 78 ++--
l10n/be/user_ldap.po | 4 +-
l10n/bg_BG/core.po | 170 ++++---
l10n/bg_BG/files.po | 28 +-
l10n/bg_BG/files_encryption.po | 5 +-
l10n/bg_BG/files_external.po | 18 +-
l10n/bg_BG/files_sharing.po | 5 +-
l10n/bg_BG/files_trashbin.po | 8 +-
l10n/bg_BG/files_versions.po | 9 +-
l10n/bg_BG/lib.po | 57 ++-
l10n/bg_BG/settings.po | 97 ++--
l10n/bg_BG/user_ldap.po | 4 +-
l10n/bn_BD/core.po | 90 ++--
l10n/bn_BD/files.po | 29 +-
l10n/bn_BD/files_encryption.po | 4 +-
l10n/bn_BD/files_external.po | 17 +-
l10n/bn_BD/files_sharing.po | 6 +-
l10n/bn_BD/files_trashbin.po | 4 +-
l10n/bn_BD/files_versions.po | 4 +-
l10n/bn_BD/lib.po | 61 ++-
l10n/bn_BD/settings.po | 87 ++--
l10n/bn_BD/user_ldap.po | 4 +-
l10n/ca/core.po | 82 ++--
l10n/ca/files.po | 37 +-
l10n/ca/files_encryption.po | 8 +-
l10n/ca/files_external.po | 19 +-
l10n/ca/files_sharing.po | 5 +-
l10n/ca/files_trashbin.po | 5 +-
l10n/ca/files_versions.po | 7 +-
l10n/ca/lib.po | 59 ++-
l10n/ca/settings.po | 94 ++--
l10n/ca/user_ldap.po | 8 +-
l10n/cs_CZ/core.po | 49 +-
l10n/cs_CZ/files.po | 25 +-
l10n/cs_CZ/files_encryption.po | 6 +-
l10n/cs_CZ/files_external.po | 19 +-
l10n/cs_CZ/files_sharing.po | 7 +-
l10n/cs_CZ/files_trashbin.po | 5 +-
l10n/cs_CZ/files_versions.po | 6 +-
l10n/cs_CZ/lib.po | 63 ++-
l10n/cs_CZ/settings.po | 88 ++--
l10n/cs_CZ/user_ldap.po | 6 +-
l10n/cy_GB/core.po | 57 ++-
l10n/cy_GB/files.po | 17 +-
l10n/cy_GB/files_encryption.po | 4 +-
l10n/cy_GB/files_external.po | 15 +-
l10n/cy_GB/files_sharing.po | 7 +-
l10n/cy_GB/files_trashbin.po | 7 +-
l10n/cy_GB/files_versions.po | 4 +-
l10n/cy_GB/lib.po | 58 ++-
l10n/cy_GB/settings.po | 78 ++--
l10n/cy_GB/user_ldap.po | 4 +-
l10n/da/core.po | 89 ++--
l10n/da/files.po | 42 +-
l10n/da/files_encryption.po | 7 +-
l10n/da/files_external.po | 19 +-
l10n/da/files_sharing.po | 6 +-
l10n/da/files_trashbin.po | 6 +-
l10n/da/files_versions.po | 8 +-
l10n/da/lib.po | 70 +--
l10n/da/settings.po | 98 ++--
l10n/da/user_ldap.po | 9 +-
l10n/de/core.po | 81 ++--
l10n/de/files.po | 58 ++-
l10n/de/files_encryption.po | 8 +-
l10n/de/files_external.po | 24 +-
l10n/de/files_sharing.po | 9 +-
l10n/de/files_trashbin.po | 10 +-
l10n/de/files_versions.po | 11 +-
l10n/de/lib.po | 73 +--
l10n/de/settings.po | 101 +++--
l10n/de/user_ldap.po | 14 +-
l10n/de_DE/core.po | 87 ++--
l10n/de_DE/files.po | 99 +++--
l10n/de_DE/files_encryption.po | 12 +-
l10n/de_DE/files_external.po | 24 +-
l10n/de_DE/files_sharing.po | 13 +-
l10n/de_DE/files_trashbin.po | 11 +-
l10n/de_DE/files_versions.po | 16 +-
l10n/de_DE/lib.po | 70 ++-
l10n/de_DE/settings.po | 110 +++--
l10n/de_DE/user_ldap.po | 18 +-
l10n/el/core.po | 90 ++--
l10n/el/files.po | 30 +-
l10n/el/files_encryption.po | 9 +-
l10n/el/files_external.po | 25 +-
l10n/el/files_sharing.po | 7 +-
l10n/el/files_trashbin.po | 5 +-
l10n/el/files_versions.po | 8 +-
l10n/el/lib.po | 66 ++-
l10n/el/settings.po | 103 +++--
l10n/el/user_ldap.po | 11 +-
l10n/eo/core.po | 77 ++--
l10n/eo/files.po | 29 +-
l10n/eo/files_encryption.po | 5 +-
l10n/eo/files_external.po | 16 +-
l10n/eo/files_sharing.po | 5 +-
l10n/eo/files_trashbin.po | 4 +-
l10n/eo/files_versions.po | 6 +-
l10n/eo/lib.po | 64 +--
l10n/eo/settings.po | 107 +++--
l10n/eo/user_ldap.po | 6 +-
l10n/es/core.po | 59 +--
l10n/es/files.po | 46 +-
l10n/es/files_encryption.po | 8 +-
l10n/es/files_external.po | 22 +-
l10n/es/files_sharing.po | 7 +-
l10n/es/files_trashbin.po | 6 +-
l10n/es/files_versions.po | 10 +-
l10n/es/lib.po | 67 ++-
l10n/es/settings.po | 111 +++--
l10n/es/user_ldap.po | 12 +-
l10n/es_AR/core.po | 115 +++--
l10n/es_AR/files.po | 34 +-
l10n/es_AR/files_encryption.po | 6 +-
l10n/es_AR/files_external.po | 18 +-
l10n/es_AR/files_sharing.po | 5 +-
l10n/es_AR/files_trashbin.po | 5 +-
l10n/es_AR/files_versions.po | 7 +-
l10n/es_AR/lib.po | 71 +--
l10n/es_AR/settings.po | 90 ++--
l10n/es_AR/user_ldap.po | 7 +-
l10n/et_EE/core.po | 87 ++--
l10n/et_EE/files.po | 23 +-
l10n/et_EE/files_encryption.po | 7 +-
l10n/et_EE/files_external.po | 22 +-
l10n/et_EE/files_sharing.po | 7 +-
l10n/et_EE/files_trashbin.po | 8 +-
l10n/et_EE/files_versions.po | 11 +-
l10n/et_EE/lib.po | 64 +--
l10n/et_EE/settings.po | 85 ++--
l10n/et_EE/user_ldap.po | 6 +-
l10n/et_EE/user_webdavauth.po | 10 +-
l10n/eu/core.po | 80 ++--
l10n/eu/files.po | 32 +-
l10n/eu/files_encryption.po | 8 +-
l10n/eu/files_external.po | 17 +-
l10n/eu/files_sharing.po | 5 +-
l10n/eu/files_trashbin.po | 5 +-
l10n/eu/files_versions.po | 6 +-
l10n/eu/lib.po | 67 +--
l10n/eu/settings.po | 90 ++--
l10n/eu/user_ldap.po | 6 +-
l10n/fa/core.po | 92 ++--
l10n/fa/files.po | 40 +-
l10n/fa/files_encryption.po | 7 +-
l10n/fa/files_external.po | 16 +-
l10n/fa/files_sharing.po | 6 +-
l10n/fa/files_trashbin.po | 5 +-
l10n/fa/files_versions.po | 7 +-
l10n/fa/lib.po | 58 ++-
l10n/fa/settings.po | 98 ++--
l10n/fa/user_ldap.po | 9 +-
l10n/fi/core.po | 68 ++-
l10n/fi/files.po | 16 +-
l10n/fi/lib.po | 55 ++-
l10n/fi_FI/core.po | 126 +++---
l10n/fi_FI/files.po | 29 +-
l10n/fi_FI/files_encryption.po | 5 +-
l10n/fi_FI/files_external.po | 18 +-
l10n/fi_FI/files_sharing.po | 6 +-
l10n/fi_FI/files_trashbin.po | 5 +-
l10n/fi_FI/files_versions.po | 5 +-
l10n/fi_FI/lib.po | 58 ++-
l10n/fi_FI/settings.po | 90 ++--
l10n/fi_FI/user_ldap.po | 7 +-
l10n/fr/core.po | 95 ++--
l10n/fr/files.po | 47 +-
l10n/fr/files_encryption.po | 5 +-
l10n/fr/files_external.po | 18 +-
l10n/fr/files_sharing.po | 9 +-
l10n/fr/files_trashbin.po | 6 +-
l10n/fr/files_versions.po | 6 +-
l10n/fr/lib.po | 63 ++-
l10n/fr/settings.po | 106 +++--
l10n/fr/user_ldap.po | 12 +-
l10n/gl/core.po | 89 ++--
l10n/gl/files.po | 29 +-
l10n/gl/files_encryption.po | 6 +-
l10n/gl/files_external.po | 18 +-
l10n/gl/files_sharing.po | 6 +-
l10n/gl/files_trashbin.po | 5 +-
l10n/gl/files_versions.po | 8 +-
l10n/gl/lib.po | 63 ++-
l10n/gl/settings.po | 89 ++--
l10n/gl/user_ldap.po | 11 +-
l10n/he/core.po | 85 ++--
l10n/he/files.po | 28 +-
l10n/he/files_encryption.po | 5 +-
l10n/he/files_external.po | 17 +-
l10n/he/files_sharing.po | 7 +-
l10n/he/files_trashbin.po | 5 +-
l10n/he/files_versions.po | 8 +-
l10n/he/lib.po | 57 ++-
l10n/he/settings.po | 94 ++--
l10n/he/user_ldap.po | 5 +-
l10n/hi/core.po | 74 ++--
l10n/hi/files.po | 14 +-
l10n/hi/files_encryption.po | 4 +-
l10n/hi/files_external.po | 15 +-
l10n/hi/files_sharing.po | 6 +-
l10n/hi/files_trashbin.po | 4 +-
l10n/hi/files_versions.po | 4 +-
l10n/hi/lib.po | 55 ++-
l10n/hi/settings.po | 80 ++--
l10n/hi/user_ldap.po | 6 +-
l10n/hr/core.po | 82 ++--
l10n/hr/files.po | 39 +-
l10n/hr/files_encryption.po | 4 +-
l10n/hr/files_external.po | 15 +-
l10n/hr/files_sharing.po | 12 +-
l10n/hr/files_trashbin.po | 4 +-
l10n/hr/files_versions.po | 4 +-
l10n/hr/lib.po | 57 ++-
l10n/hr/settings.po | 89 ++--
l10n/hr/user_ldap.po | 6 +-
l10n/hu_HU/core.po | 85 ++--
l10n/hu_HU/files.po | 25 +-
l10n/hu_HU/files_encryption.po | 8 +-
l10n/hu_HU/files_external.po | 16 +-
l10n/hu_HU/files_sharing.po | 5 +-
l10n/hu_HU/files_trashbin.po | 6 +-
l10n/hu_HU/files_versions.po | 5 +-
l10n/hu_HU/lib.po | 64 ++-
l10n/hu_HU/settings.po | 86 ++--
l10n/hu_HU/user_ldap.po | 6 +-
l10n/hy/core.po | 442 ++++++-------------
l10n/hy/files.po | 16 +-
l10n/hy/files_external.po | 17 +-
l10n/hy/files_sharing.po | 22 +-
l10n/hy/files_trashbin.po | 6 +-
l10n/hy/settings.po | 82 ++--
l10n/ia/core.po | 69 ++-
l10n/ia/files.po | 18 +-
l10n/ia/files_encryption.po | 4 +-
l10n/ia/files_external.po | 15 +-
l10n/ia/files_sharing.po | 12 +-
l10n/ia/files_trashbin.po | 4 +-
l10n/ia/files_versions.po | 4 +-
l10n/ia/lib.po | 57 ++-
l10n/ia/settings.po | 86 ++--
l10n/ia/user_ldap.po | 6 +-
l10n/id/core.po | 89 ++--
l10n/id/files.po | 25 +-
l10n/id/files_encryption.po | 6 +-
l10n/id/files_external.po | 18 +-
l10n/id/files_sharing.po | 6 +-
l10n/id/files_trashbin.po | 14 +-
l10n/id/files_versions.po | 7 +-
l10n/id/lib.po | 58 ++-
l10n/id/settings.po | 92 ++--
l10n/id/user_ldap.po | 15 +-
l10n/is/core.po | 88 ++--
l10n/is/files.po | 15 +-
l10n/is/files_encryption.po | 5 +-
l10n/is/files_external.po | 16 +-
l10n/is/files_sharing.po | 5 +-
l10n/is/files_trashbin.po | 4 +-
l10n/is/files_versions.po | 5 +-
l10n/is/lib.po | 56 ++-
l10n/is/settings.po | 81 ++--
l10n/is/user_ldap.po | 5 +-
l10n/it/core.po | 89 ++--
l10n/it/files.po | 30 +-
l10n/it/files_encryption.po | 7 +-
l10n/it/files_external.po | 17 +-
l10n/it/files_sharing.po | 5 +-
l10n/it/files_trashbin.po | 5 +-
l10n/it/files_versions.po | 5 +-
l10n/it/lib.po | 62 ++-
l10n/it/settings.po | 89 ++--
l10n/it/user_ldap.po | 6 +-
l10n/ja_JP/core.po | 86 ++--
l10n/ja_JP/files.po | 33 +-
l10n/ja_JP/files_encryption.po | 6 +-
l10n/ja_JP/files_external.po | 18 +-
l10n/ja_JP/files_sharing.po | 6 +-
l10n/ja_JP/files_trashbin.po | 5 +-
l10n/ja_JP/files_versions.po | 8 +-
l10n/ja_JP/lib.po | 68 +--
l10n/ja_JP/settings.po | 93 ++--
l10n/ja_JP/user_ldap.po | 8 +-
l10n/ka/core.po | 68 ++-
l10n/ka/files.po | 14 +-
l10n/ka/files_encryption.po | 4 +-
l10n/ka/files_external.po | 15 +-
l10n/ka/files_sharing.po | 5 +-
l10n/ka/files_trashbin.po | 4 +-
l10n/ka/files_versions.po | 4 +-
l10n/ka/lib.po | 56 ++-
l10n/ka/settings.po | 80 ++--
l10n/ka/user_ldap.po | 4 +-
l10n/ka_GE/core.po | 68 ++-
l10n/ka_GE/files.po | 20 +-
l10n/ka_GE/files_encryption.po | 7 +-
l10n/ka_GE/files_external.po | 18 +-
l10n/ka_GE/files_sharing.po | 8 +-
l10n/ka_GE/files_trashbin.po | 7 +-
l10n/ka_GE/files_versions.po | 7 +-
l10n/ka_GE/lib.po | 57 ++-
l10n/ka_GE/settings.po | 83 ++--
l10n/ka_GE/user_ldap.po | 7 +-
l10n/kn/core.po | 68 ++-
l10n/kn/files.po | 14 +-
l10n/kn/files_encryption.po | 4 +-
l10n/kn/files_external.po | 15 +-
l10n/kn/files_sharing.po | 4 +-
l10n/kn/files_trashbin.po | 4 +-
l10n/kn/files_versions.po | 4 +-
l10n/kn/lib.po | 55 ++-
l10n/kn/settings.po | 78 ++--
l10n/kn/user_ldap.po | 4 +-
l10n/ko/core.po | 98 ++--
l10n/ko/files.po | 38 +-
l10n/ko/files_encryption.po | 6 +-
l10n/ko/files_external.po | 19 +-
l10n/ko/files_sharing.po | 7 +-
l10n/ko/files_trashbin.po | 4 +-
l10n/ko/files_versions.po | 7 +-
l10n/ko/lib.po | 58 ++-
l10n/ko/settings.po | 93 ++--
l10n/ko/user_ldap.po | 8 +-
l10n/ku_IQ/core.po | 69 ++-
l10n/ku_IQ/files.po | 14 +-
l10n/ku_IQ/files_encryption.po | 5 +-
l10n/ku_IQ/files_external.po | 15 +-
l10n/ku_IQ/files_sharing.po | 7 +-
l10n/ku_IQ/files_trashbin.po | 4 +-
l10n/ku_IQ/files_versions.po | 7 +-
l10n/ku_IQ/lib.po | 57 ++-
l10n/ku_IQ/settings.po | 80 ++--
l10n/ku_IQ/user_ldap.po | 6 +-
l10n/lb/core.po | 76 ++--
l10n/lb/files.po | 19 +-
l10n/lb/files_encryption.po | 4 +-
l10n/lb/files_external.po | 17 +-
l10n/lb/files_sharing.po | 10 +-
l10n/lb/files_trashbin.po | 4 +-
l10n/lb/files_versions.po | 5 +-
l10n/lb/lib.po | 59 ++-
l10n/lb/settings.po | 99 +++--
l10n/lb/user_ldap.po | 4 +-
l10n/lt_LT/core.po | 76 ++--
l10n/lt_LT/files.po | 25 +-
l10n/lt_LT/files_encryption.po | 5 +-
l10n/lt_LT/files_external.po | 18 +-
l10n/lt_LT/files_sharing.po | 13 +-
l10n/lt_LT/files_trashbin.po | 4 +-
l10n/lt_LT/files_versions.po | 7 +-
l10n/lt_LT/lib.po | 65 +--
l10n/lt_LT/settings.po | 94 ++--
l10n/lt_LT/user_ldap.po | 5 +-
l10n/lv/core.po | 82 ++--
l10n/lv/files.po | 21 +-
l10n/lv/files_encryption.po | 5 +-
l10n/lv/files_external.po | 16 +-
l10n/lv/files_sharing.po | 7 +-
l10n/lv/files_trashbin.po | 5 +-
l10n/lv/files_versions.po | 5 +-
l10n/lv/lib.po | 56 ++-
l10n/lv/settings.po | 85 ++--
l10n/lv/user_ldap.po | 5 +-
l10n/mk/core.po | 81 ++--
l10n/mk/files.po | 27 +-
l10n/mk/files_encryption.po | 5 +-
l10n/mk/files_external.po | 16 +-
l10n/mk/files_sharing.po | 5 +-
l10n/mk/files_trashbin.po | 4 +-
l10n/mk/files_versions.po | 5 +-
l10n/mk/lib.po | 58 ++-
l10n/mk/settings.po | 89 ++--
l10n/mk/user_ldap.po | 5 +-
l10n/ms_MY/core.po | 79 ++--
l10n/ms_MY/files.po | 34 +-
l10n/ms_MY/files_encryption.po | 4 +-
l10n/ms_MY/files_external.po | 15 +-
l10n/ms_MY/files_sharing.po | 12 +-
l10n/ms_MY/files_trashbin.po | 4 +-
l10n/ms_MY/files_versions.po | 4 +-
l10n/ms_MY/lib.po | 57 ++-
l10n/ms_MY/settings.po | 94 ++--
l10n/ms_MY/user_ldap.po | 6 +-
l10n/my_MM/core.po | 73 ++-
l10n/my_MM/files.po | 14 +-
l10n/my_MM/files_encryption.po | 4 +-
l10n/my_MM/files_external.po | 15 +-
l10n/my_MM/files_sharing.po | 4 +-
l10n/my_MM/files_trashbin.po | 4 +-
l10n/my_MM/files_versions.po | 4 +-
l10n/my_MM/lib.po | 56 ++-
l10n/my_MM/settings.po | 80 ++--
l10n/my_MM/user_ldap.po | 4 +-
l10n/nb_NO/core.po | 81 ++--
l10n/nb_NO/files.po | 37 +-
l10n/nb_NO/files_encryption.po | 6 +-
l10n/nb_NO/files_external.po | 17 +-
l10n/nb_NO/files_sharing.po | 6 +-
l10n/nb_NO/files_trashbin.po | 5 +-
l10n/nb_NO/files_versions.po | 8 +-
l10n/nb_NO/lib.po | 64 ++-
l10n/nb_NO/settings.po | 110 +++--
l10n/nb_NO/user_ldap.po | 6 +-
l10n/ne/core.po | 68 ++-
l10n/ne/files.po | 14 +-
l10n/ne/files_encryption.po | 4 +-
l10n/ne/files_external.po | 15 +-
l10n/ne/files_sharing.po | 4 +-
l10n/ne/files_trashbin.po | 4 +-
l10n/ne/files_versions.po | 4 +-
l10n/ne/lib.po | 55 ++-
l10n/ne/settings.po | 78 ++--
l10n/ne/user_ldap.po | 4 +-
l10n/nl/core.po | 97 ++--
l10n/nl/files.po | 54 ++-
l10n/nl/files_encryption.po | 7 +-
l10n/nl/files_external.po | 20 +-
l10n/nl/files_sharing.po | 6 +-
l10n/nl/files_trashbin.po | 5 +-
l10n/nl/files_versions.po | 6 +-
l10n/nl/lib.po | 59 ++-
l10n/nl/settings.po | 109 +++--
l10n/nl/user_ldap.po | 7 +-
l10n/nn_NO/core.po | 247 +++++------
l10n/nn_NO/files.po | 165 ++++---
l10n/nn_NO/files_encryption.po | 4 +-
l10n/nn_NO/files_external.po | 15 +-
l10n/nn_NO/files_sharing.po | 12 +-
l10n/nn_NO/files_trashbin.po | 14 +-
l10n/nn_NO/files_versions.po | 4 +-
l10n/nn_NO/lib.po | 79 ++--
l10n/nn_NO/settings.po | 261 +++++------
l10n/nn_NO/user_ldap.po | 6 +-
l10n/oc/core.po | 101 ++---
l10n/oc/files.po | 19 +-
l10n/oc/files_encryption.po | 4 +-
l10n/oc/files_external.po | 15 +-
l10n/oc/files_sharing.po | 12 +-
l10n/oc/files_trashbin.po | 4 +-
l10n/oc/files_versions.po | 4 +-
l10n/oc/lib.po | 56 ++-
l10n/oc/settings.po | 95 ++--
l10n/oc/user_ldap.po | 6 +-
l10n/pl/core.po | 89 ++--
l10n/pl/files.po | 38 +-
l10n/pl/files_encryption.po | 8 +-
l10n/pl/files_external.po | 19 +-
l10n/pl/files_sharing.po | 7 +-
l10n/pl/files_trashbin.po | 9 +-
l10n/pl/files_versions.po | 8 +-
l10n/pl/lib.po | 71 +--
l10n/pl/settings.po | 98 ++--
l10n/pl/user_ldap.po | 11 +-
l10n/pl_PL/core.po | 70 ++-
l10n/pl_PL/files.po | 18 +-
l10n/pl_PL/lib.po | 57 ++-
l10n/pl_PL/settings.po | 84 ++--
l10n/pt_BR/core.po | 95 ++--
l10n/pt_BR/files.po | 40 +-
l10n/pt_BR/files_encryption.po | 8 +-
l10n/pt_BR/files_external.po | 23 +-
l10n/pt_BR/files_sharing.po | 7 +-
l10n/pt_BR/files_trashbin.po | 5 +-
l10n/pt_BR/files_versions.po | 8 +-
l10n/pt_BR/lib.po | 60 ++-
l10n/pt_BR/settings.po | 106 +++--
l10n/pt_BR/user_ldap.po | 9 +-
l10n/pt_PT/core.po | 94 ++--
l10n/pt_PT/files.po | 42 +-
l10n/pt_PT/files_encryption.po | 6 +-
l10n/pt_PT/files_external.po | 18 +-
l10n/pt_PT/files_sharing.po | 6 +-
l10n/pt_PT/files_trashbin.po | 8 +-
l10n/pt_PT/files_versions.po | 7 +-
l10n/pt_PT/lib.po | 67 +--
l10n/pt_PT/settings.po | 98 ++--
l10n/pt_PT/user_ldap.po | 11 +-
l10n/ro/core.po | 109 +++--
l10n/ro/files.po | 53 +--
l10n/ro/files_encryption.po | 6 +-
l10n/ro/files_external.po | 21 +-
l10n/ro/files_sharing.po | 5 +-
l10n/ro/files_trashbin.po | 6 +-
l10n/ro/files_versions.po | 23 +-
l10n/ro/lib.po | 58 ++-
l10n/ro/settings.po | 125 +++---
l10n/ro/user_ldap.po | 7 +-
l10n/ru/core.po | 97 ++--
l10n/ru/files.po | 48 +-
l10n/ru/files_encryption.po | 8 +-
l10n/ru/files_external.po | 19 +-
l10n/ru/files_sharing.po | 8 +-
l10n/ru/files_trashbin.po | 5 +-
l10n/ru/files_versions.po | 8 +-
l10n/ru/lib.po | 69 ++-
l10n/ru/settings.po | 106 +++--
l10n/ru/user_ldap.po | 9 +-
l10n/ru_RU/core.po | 341 +++++++-------
l10n/ru_RU/files.po | 22 +-
l10n/ru_RU/lib.po | 122 ++---
l10n/ru_RU/settings.po | 214 ++++-----
l10n/si_LK/core.po | 87 ++--
l10n/si_LK/files.po | 28 +-
l10n/si_LK/files_encryption.po | 5 +-
l10n/si_LK/files_external.po | 16 +-
l10n/si_LK/files_sharing.po | 9 +-
l10n/si_LK/files_trashbin.po | 4 +-
l10n/si_LK/files_versions.po | 7 +-
l10n/si_LK/lib.po | 59 ++-
l10n/si_LK/settings.po | 107 +++--
l10n/si_LK/user_ldap.po | 5 +-
l10n/sk/core.po | 68 ++-
l10n/sk/files.po | 14 +-
l10n/sk/files_encryption.po | 4 +-
l10n/sk/files_external.po | 15 +-
l10n/sk/files_sharing.po | 4 +-
l10n/sk/files_trashbin.po | 4 +-
l10n/sk/files_versions.po | 4 +-
l10n/sk/lib.po | 55 ++-
l10n/sk/settings.po | 78 ++--
l10n/sk/user_ldap.po | 4 +-
l10n/sk_SK/core.po | 92 ++--
l10n/sk_SK/files.po | 45 +-
l10n/sk_SK/files_encryption.po | 9 +-
l10n/sk_SK/files_external.po | 23 +-
l10n/sk_SK/files_sharing.po | 8 +-
l10n/sk_SK/files_trashbin.po | 8 +-
l10n/sk_SK/files_versions.po | 7 +-
l10n/sk_SK/lib.po | 61 ++-
l10n/sk_SK/settings.po | 95 ++--
l10n/sk_SK/user_ldap.po | 6 +-
l10n/sl/core.po | 65 ++-
l10n/sl/files.po | 35 +-
l10n/sl/files_encryption.po | 7 +-
l10n/sl/files_external.po | 25 +-
l10n/sl/files_sharing.po | 6 +-
l10n/sl/files_trashbin.po | 8 +-
l10n/sl/files_versions.po | 7 +-
l10n/sl/lib.po | 64 ++-
l10n/sl/settings.po | 95 ++--
l10n/sl/user_ldap.po | 7 +-
l10n/sq/core.po | 78 ++--
l10n/sq/files.po | 15 +-
l10n/sq/files_encryption.po | 4 +-
l10n/sq/files_external.po | 15 +-
l10n/sq/files_sharing.po | 5 +-
l10n/sq/files_trashbin.po | 5 +-
l10n/sq/files_versions.po | 4 +-
l10n/sq/lib.po | 58 ++-
l10n/sq/settings.po | 83 ++--
l10n/sq/user_ldap.po | 4 +-
l10n/sr/core.po | 89 ++--
l10n/sr/files.po | 20 +-
l10n/sr/files_encryption.po | 6 +-
l10n/sr/files_external.po | 15 +-
l10n/sr/files_sharing.po | 6 +-
l10n/sr/files_trashbin.po | 5 +-
l10n/sr/files_versions.po | 5 +-
l10n/sr/lib.po | 60 ++-
l10n/sr/settings.po | 87 ++--
l10n/sr/user_ldap.po | 5 +-
l10n/sr@latin/core.po | 75 ++--
l10n/sr@latin/files.po | 15 +-
l10n/sr@latin/files_encryption.po | 4 +-
l10n/sr@latin/files_external.po | 15 +-
l10n/sr@latin/files_sharing.po | 10 +-
l10n/sr@latin/files_trashbin.po | 4 +-
l10n/sr@latin/files_versions.po | 4 +-
l10n/sr@latin/lib.po | 57 ++-
l10n/sr@latin/settings.po | 81 ++--
l10n/sr@latin/user_ldap.po | 6 +-
l10n/sv/core.po | 85 ++--
l10n/sv/files.po | 33 +-
l10n/sv/files_encryption.po | 6 +-
l10n/sv/files_external.po | 17 +-
l10n/sv/files_sharing.po | 5 +-
l10n/sv/files_trashbin.po | 6 +-
l10n/sv/files_versions.po | 5 +-
l10n/sv/lib.po | 61 ++-
l10n/sv/settings.po | 107 +++--
l10n/sv/user_ldap.po | 7 +-
l10n/sw_KE/core.po | 68 ++-
l10n/sw_KE/files.po | 14 +-
l10n/sw_KE/files_encryption.po | 4 +-
l10n/sw_KE/files_external.po | 15 +-
l10n/sw_KE/files_sharing.po | 4 +-
l10n/sw_KE/files_trashbin.po | 4 +-
l10n/sw_KE/files_versions.po | 4 +-
l10n/sw_KE/lib.po | 55 ++-
l10n/sw_KE/settings.po | 78 ++--
l10n/sw_KE/user_ldap.po | 4 +-
l10n/ta_LK/core.po | 90 ++--
l10n/ta_LK/files.po | 19 +-
l10n/ta_LK/files_encryption.po | 5 +-
l10n/ta_LK/files_external.po | 16 +-
l10n/ta_LK/files_sharing.po | 5 +-
l10n/ta_LK/files_trashbin.po | 4 +-
l10n/ta_LK/files_versions.po | 7 +-
l10n/ta_LK/lib.po | 58 ++-
l10n/ta_LK/settings.po | 87 ++--
l10n/ta_LK/user_ldap.po | 5 +-
l10n/te/core.po | 69 ++-
l10n/te/files.po | 15 +-
l10n/te/files_encryption.po | 4 +-
l10n/te/files_external.po | 15 +-
l10n/te/files_sharing.po | 4 +-
l10n/te/files_trashbin.po | 4 +-
l10n/te/files_versions.po | 4 +-
l10n/te/lib.po | 55 ++-
l10n/te/settings.po | 81 ++--
l10n/te/user_ldap.po | 4 +-
l10n/templates/core.pot | 28 +-
l10n/templates/files.pot | 58 ++-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 13 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 19 +-
l10n/templates/settings.pot | 74 ++--
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 84 ++--
l10n/th_TH/files.po | 34 +-
l10n/th_TH/files_encryption.po | 7 +-
l10n/th_TH/files_external.po | 16 +-
l10n/th_TH/files_sharing.po | 5 +-
l10n/th_TH/files_trashbin.po | 5 +-
l10n/th_TH/files_versions.po | 7 +-
l10n/th_TH/lib.po | 62 ++-
l10n/th_TH/settings.po | 119 ++---
l10n/th_TH/user_ldap.po | 5 +-
l10n/tr/core.po | 50 +--
l10n/tr/files.po | 35 +-
l10n/tr/files_encryption.po | 6 +-
l10n/tr/files_external.po | 21 +-
l10n/tr/files_sharing.po | 7 +-
l10n/tr/files_trashbin.po | 6 +-
l10n/tr/files_versions.po | 7 +-
l10n/tr/lib.po | 28 +-
l10n/tr/settings.po | 93 ++--
l10n/tr/user_ldap.po | 48 +-
l10n/uk/core.po | 86 ++--
l10n/uk/files.po | 22 +-
l10n/uk/files_encryption.po | 6 +-
l10n/uk/files_external.po | 18 +-
l10n/uk/files_sharing.po | 8 +-
l10n/uk/files_trashbin.po | 5 +-
l10n/uk/files_versions.po | 6 +-
l10n/uk/lib.po | 60 ++-
l10n/uk/settings.po | 86 ++--
l10n/uk/user_ldap.po | 7 +-
l10n/ur_PK/core.po | 73 ++-
l10n/ur_PK/files.po | 16 +-
l10n/ur_PK/files_encryption.po | 4 +-
l10n/ur_PK/files_external.po | 15 +-
l10n/ur_PK/files_sharing.po | 4 +-
l10n/ur_PK/files_trashbin.po | 4 +-
l10n/ur_PK/files_versions.po | 4 +-
l10n/ur_PK/lib.po | 55 ++-
l10n/ur_PK/settings.po | 80 ++--
l10n/ur_PK/user_ldap.po | 4 +-
l10n/vi/core.po | 92 ++--
l10n/vi/files.po | 35 +-
l10n/vi/files_encryption.po | 8 +-
l10n/vi/files_external.po | 18 +-
l10n/vi/files_sharing.po | 6 +-
l10n/vi/files_trashbin.po | 5 +-
l10n/vi/files_versions.po | 9 +-
l10n/vi/lib.po | 63 ++-
l10n/vi/settings.po | 119 ++---
l10n/vi/user_ldap.po | 7 +-
l10n/zh_CN.GB2312/core.po | 89 ++--
l10n/zh_CN.GB2312/files.po | 38 +-
l10n/zh_CN.GB2312/files_encryption.po | 5 +-
l10n/zh_CN.GB2312/files_external.po | 17 +-
l10n/zh_CN.GB2312/files_sharing.po | 5 +-
l10n/zh_CN.GB2312/files_trashbin.po | 4 +-
l10n/zh_CN.GB2312/files_versions.po | 6 +-
l10n/zh_CN.GB2312/lib.po | 56 ++-
l10n/zh_CN.GB2312/settings.po | 101 +++--
l10n/zh_CN.GB2312/user_ldap.po | 5 +-
l10n/zh_CN/core.po | 97 ++--
l10n/zh_CN/files.po | 37 +-
l10n/zh_CN/files_encryption.po | 6 +-
l10n/zh_CN/files_external.po | 18 +-
l10n/zh_CN/files_sharing.po | 5 +-
l10n/zh_CN/files_trashbin.po | 5 +-
l10n/zh_CN/files_versions.po | 6 +-
l10n/zh_CN/lib.po | 64 ++-
l10n/zh_CN/settings.po | 96 ++--
l10n/zh_CN/user_ldap.po | 6 +-
l10n/zh_HK/core.po | 76 ++--
l10n/zh_HK/files.po | 15 +-
l10n/zh_HK/files_encryption.po | 5 +-
l10n/zh_HK/files_external.po | 15 +-
l10n/zh_HK/files_sharing.po | 4 +-
l10n/zh_HK/files_trashbin.po | 4 +-
l10n/zh_HK/files_versions.po | 5 +-
l10n/zh_HK/lib.po | 55 ++-
l10n/zh_HK/settings.po | 80 ++--
l10n/zh_HK/user_ldap.po | 4 +-
l10n/zh_TW/core.po | 69 ++-
l10n/zh_TW/files.po | 25 +-
l10n/zh_TW/files_encryption.po | 7 +-
l10n/zh_TW/files_external.po | 48 +-
l10n/zh_TW/files_sharing.po | 16 +-
l10n/zh_TW/files_trashbin.po | 8 +-
l10n/zh_TW/files_versions.po | 6 +-
l10n/zh_TW/lib.po | 62 ++-
l10n/zh_TW/settings.po | 94 ++--
l10n/zh_TW/user_ldap.po | 5 +-
lib/api.php | 6 +-
lib/base.php | 26 +-
lib/files/cache/cache.php | 49 +-
lib/files/cache/scanner.php | 2 +-
lib/files/cache/storage.php | 59 ---
lib/files/filesystem.php | 39 +-
lib/files/{mount => }/mount.php | 106 ++++-
lib/files/mount/manager.php | 120 -----
lib/files/storage/common.php | 10 +-
lib/files/storage/local.php | 437 +++++++++---------
lib/files/storage/storage.php | 5 -
lib/files/view.php | 2 +-
lib/l10n/ar.php | 5 +-
lib/l10n/bg_BG.php | 3 +
lib/l10n/bn_BD.php | 10 +-
lib/l10n/ca.php | 5 +-
lib/l10n/cs_CZ.php | 9 +-
lib/l10n/cy_GB.php | 3 +
lib/l10n/da.php | 13 +-
lib/l10n/de.php | 11 +-
lib/l10n/de_DE.php | 7 +-
lib/l10n/el.php | 9 +-
lib/l10n/eo.php | 11 +-
lib/l10n/es.php | 7 +-
lib/l10n/es_AR.php | 15 +-
lib/l10n/et_EE.php | 9 +-
lib/l10n/eu.php | 13 +-
lib/l10n/fi_FI.php | 5 +-
lib/l10n/fr.php | 7 +-
lib/l10n/gl.php | 7 +-
lib/l10n/he.php | 3 +
lib/l10n/hr.php | 1 -
lib/l10n/hu_HU.php | 9 +-
lib/l10n/ia.php | 1 -
lib/l10n/id.php | 3 +
lib/l10n/is.php | 3 +
lib/l10n/it.php | 9 +-
lib/l10n/ja_JP.php | 13 +-
lib/l10n/ka_GE.php | 3 +
lib/l10n/ko.php | 3 +
lib/l10n/ku_IQ.php | 1 -
lib/l10n/lb.php | 2 -
lib/l10n/lt_LT.php | 13 +-
lib/l10n/lv.php | 3 +
lib/l10n/mk.php | 5 +-
lib/l10n/ms_MY.php | 1 -
lib/l10n/my_MM.php | 3 +
lib/l10n/nb_NO.php | 7 +-
lib/l10n/nl.php | 3 +
lib/l10n/nn_NO.php | 13 +-
lib/l10n/oc.php | 4 +-
lib/l10n/pl.php | 15 +-
lib/l10n/pt_BR.php | 3 +
lib/l10n/pt_PT.php | 11 +-
lib/l10n/ro.php | 3 +
lib/l10n/ru.php | 9 +-
lib/l10n/ru_RU.php | 36 +-
lib/l10n/si_LK.php | 7 +-
lib/l10n/sk_SK.php | 5 +-
lib/l10n/sl.php | 9 +-
lib/l10n/sq.php | 5 +-
lib/l10n/sr.php | 5 +-
lib/l10n/sr@latin.php | 1 -
lib/l10n/sv.php | 7 +-
lib/l10n/ta_LK.php | 5 +-
lib/l10n/th_TH.php | 9 +-
lib/l10n/tr.php | 5 +-
lib/l10n/uk.php | 3 +
lib/l10n/vi.php | 7 +-
lib/l10n/zh_CN.GB2312.php | 5 +-
lib/l10n/zh_CN.php | 9 +-
lib/l10n/zh_TW.php | 3 +
lib/public/share.php | 2 +-
lib/request.php | 13 +-
lib/templatelayout.php | 73 +--
lib/updater.php | 46 +-
lib/user.php | 2 +-
lib/util.php | 32 +-
ocs/routes.php | 74 +---
settings/js/personal.js | 3 -
settings/l10n/ar.php | 13 +-
settings/l10n/bg_BG.php | 1 -
settings/l10n/bn_BD.php | 6 +-
settings/l10n/ca.php | 11 +-
settings/l10n/cs_CZ.php | 6 +-
settings/l10n/da.php | 9 +-
settings/l10n/de.php | 6 +-
settings/l10n/de_DE.php | 10 +-
settings/l10n/el.php | 10 +-
settings/l10n/eo.php | 12 -
settings/l10n/es.php | 14 +-
settings/l10n/es_AR.php | 9 +-
settings/l10n/et_EE.php | 6 +-
settings/l10n/eu.php | 9 +-
settings/l10n/fa.php | 14 +-
settings/l10n/fi_FI.php | 8 +-
settings/l10n/fr.php | 8 +-
settings/l10n/gl.php | 4 +-
settings/l10n/he.php | 9 +-
settings/l10n/hr.php | 3 -
settings/l10n/hu_HU.php | 5 +-
settings/l10n/ia.php | 2 -
settings/l10n/id.php | 9 +-
settings/l10n/it.php | 6 +-
settings/l10n/ja_JP.php | 13 +-
settings/l10n/ka_GE.php | 8 +-
settings/l10n/ko.php | 5 +-
settings/l10n/lb.php | 9 -
settings/l10n/lt_LT.php | 8 +-
settings/l10n/lv.php | 5 +-
settings/l10n/mk.php | 4 +-
settings/l10n/ms_MY.php | 7 +-
settings/l10n/nb_NO.php | 13 +-
settings/l10n/nl.php | 18 +-
settings/l10n/nn_NO.php | 97 +---
settings/l10n/oc.php | 7 -
settings/l10n/pl.php | 7 +-
settings/l10n/pt_BR.php | 16 +-
settings/l10n/pt_PT.php | 13 +-
settings/l10n/ro.php | 22 +-
settings/l10n/ru.php | 12 +-
settings/l10n/ru_RU.php | 67 ++-
settings/l10n/si_LK.php | 17 +-
settings/l10n/sk_SK.php | 10 +-
settings/l10n/sl.php | 10 +-
settings/l10n/sq.php | 3 +-
settings/l10n/sr.php | 7 +-
settings/l10n/sv.php | 13 +-
settings/l10n/ta_LK.php | 6 +-
settings/l10n/th_TH.php | 21 +-
settings/l10n/tr.php | 7 +-
settings/l10n/uk.php | 5 +-
settings/l10n/vi.php | 21 +-
settings/l10n/zh_CN.GB2312.php | 16 +-
settings/l10n/zh_CN.php | 11 +-
settings/l10n/zh_TW.php | 9 +-
settings/personal.php | 15 +-
settings/templates/admin.php | 3 +-
settings/templates/personal.php | 7 +-
tests/lib/files/mount.php | 58 +++
tests/lib/files/mount/manager.php | 67 ---
tests/lib/streamwrappers.php | 4 +-
1091 files changed, 15371 insertions(+), 14109 deletions(-)
delete mode 100644 apps/files_sharing/l10n/hi.php
delete mode 100644 apps/files_sharing/l10n/hr.php
delete mode 100644 apps/files_sharing/l10n/hy.php
delete mode 100644 apps/files_sharing/l10n/ia.php
delete mode 100644 apps/files_sharing/l10n/ms_MY.php
delete mode 100644 apps/files_sharing/l10n/nn_NO.php
delete mode 100644 apps/files_sharing/l10n/oc.php
delete mode 100644 apps/files_sharing/l10n/sr@latin.php
delete mode 100644 core/l10n/hy.php
delete mode 100644 lib/files/cache/storage.php
rename lib/files/{mount => }/mount.php (54%)
delete mode 100644 lib/files/mount/manager.php
create mode 100644 tests/lib/files/mount.php
delete mode 100644 tests/lib/files/mount/manager.php
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 296e54e356..a2d17fae7d 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -115,11 +115,6 @@ $(document).ready(function() {
return false;
});
- // Trigger cancelling of file upload
- $('#uploadprogresswrapper .stop').on('click', function() {
- Files.cancelUploads();
- });
-
// Show trash bin
$('#trash a').live('click', function() {
window.location=OC.filePath('files_trashbin', '', 'index.php');
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index a84adc3bb0..41e6a225a2 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -14,7 +14,7 @@
"Invalid directory." => "مسار غير صØÙŠØ.",
"Files" => "الملÙات",
"Delete permanently" => "Øذ٠بشكل دائم",
-"Delete" => "إلغاء",
+"Delete" => "Ù…ØذوÙ",
"Rename" => "إعادة تسميه",
"Pending" => "قيد الانتظار",
"{new_name} already exists" => "{new_name} موجود مسبقا",
@@ -37,14 +37,14 @@
"URL cannot be empty." => "عنوان ال URL لا يجوز أن يكون Ùارغا.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "إسم مجلد غير صØÙŠØ. استخدام Ù…ØµØ·Ù„Ø \"Shared\" Ù…Øجوز للنظام",
"Error" => "خطأ",
-"Name" => "اسم",
+"Name" => "الاسم",
"Size" => "Øجم",
"Modified" => "معدل",
"1 folder" => "مجلد عدد 1",
"{count} folders" => "{count} مجلدات",
"1 file" => "مل٠واØد",
"{count} files" => "{count} ملÙات",
-"Upload" => "رÙع",
+"Upload" => "إرÙع",
"File handling" => "التعامل مع الملÙ",
"Maximum upload size" => "الØد الأقصى Ù„Øجم الملÙات التي يمكن رÙعها",
"max. possible: " => "الØد الأقصى Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 09e01745a4..c4bbca36f4 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -1,8 +1,4 @@
<?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Файлът е качен уÑпешно",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файлът който Ñе опитвате да качите надвишава ÑтойноÑтите в MAX_FILE_SIZE в HTML формата.",
-"The uploaded file was only partially uploaded" => "Файлът е качен чаÑтично",
-"No file was uploaded" => "Фахлът не бе качен",
"Missing a temporary folder" => "ЛипÑва временна папка",
"Failed to write to disk" => "Възникна проблем при Ð·Ð°Ð¿Ð¸Ñ Ð² диÑка",
"Invalid directory." => "Ðевалидна директориÑ.",
@@ -33,7 +29,5 @@
"Cancel upload" => "Спри качването",
"Nothing in here. Upload something!" => "ÐÑма нищо тук. Качете нещо.",
"Download" => "ИзтеглÑне",
-"Upload too large" => "Файлът който Ñте избрали за качване е прекалено голÑм",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които Ñе опитвате да качите Ñа по-големи от позволеното за Ñървъра.",
-"Files are being scanned, please wait." => "Файловете Ñе претърÑват, изчакайте."
+"Upload too large" => "Файлът който Ñте избрали за качване е прекалено голÑм"
);
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 42c78ab347..640430716f 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -2,18 +2,17 @@
"Could not move %s - File with this name already exists" => "%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" => "কোন সমসà§à¦¯à¦¾ হয় নি, ফাইল আপলোড সà§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ হয়েছে।",
+"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমসà§à¦¯à¦¾ অজà§à¦žà¦¾à¦¤à¥¤",
+"There is no error, the file uploaded with success" => "কোন সমসà§à¦¯à¦¾ নেই, ফাইল আপলোড সà§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ হয়েছে",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "আপলোড করা ফাইলটি php.ini তে বরà§à¦£à¦¿à¦¤ upload_max_filesize নিরà§à¦¦à§‡à¦¶à¦¿à¦¤ আয়তন অতিকà§à¦°à¦® করছেঃ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি HTML ফরà§à¦®à§‡ উলà§à¦²à¦¿à¦–িত MAX_FILE_SIZE নিরà§à¦§à¦¾à¦°à¦¿à¦¤ ফাইলের সরà§à¦¬à§‹à¦šà§à¦š আকার অতিকà§à¦°à¦® করতে চলেছে ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি HTML ফরà§à¦®à§‡ নিরà§à¦§à¦¾à¦°à¦¿à¦¤ MAX_FILE_SIZE নিরà§à¦¦à§‡à¦¶à¦¿à¦¤ সরà§à¦¬à§‹à¦šà§à¦š আকার অতিকà§à¦°à¦® করেছে ",
"The uploaded file was only partially uploaded" => "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে",
"No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
-"Missing a temporary folder" => "অসà§à¦¥à¦¾à§Ÿà§€ ফোলà§à¦¡à¦¾à¦°à¦Ÿà¦¿ হারানো গিয়েছে",
+"Missing a temporary folder" => "অসà§à¦¥à¦¾à§Ÿà§€ ফোলà§à¦¡à¦¾à¦° খোয়া গিয়েছে",
"Failed to write to disk" => "ডিসà§à¦•à§‡ লিখতে বà§à¦¯à¦°à§à¦¥",
"Invalid directory." => "à¦à§à¦² ডিরেকà§à¦Ÿà¦°à¦¿",
"Files" => "ফাইল",
-"Share" => "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর",
-"Delete" => "মà§à¦›à§‡",
+"Delete" => "মà§à¦›à§‡ ফেল",
"Rename" => "পূনঃনামকরণ",
"Pending" => "মà§à¦²à¦¤à§à¦¬à¦¿",
"{new_name} already exists" => "{new_name} টি বিদà§à¦¯à¦®à¦¾à¦¨",
@@ -33,7 +32,7 @@
"URL cannot be empty." => "URL ফাà¦à¦•à¦¾ রাখা যাবে না।",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ফোলà§à¦¡à¦¾à¦°à§‡à¦° নামটি সঠিক নয়। 'à¦à¦¾à¦—াà¦à¦¾à¦—ি করা' শà§à¦§à§à¦®à¦¾à¦¤à§à¦° Owncloud à¦à¦° জনà§à¦¯ সংরকà§à¦·à¦¿à¦¤à¥¤",
"Error" => "সমসà§à¦¯à¦¾",
-"Name" => "রাম",
+"Name" => "নাম",
"Size" => "আকার",
"Modified" => "পরিবরà§à¦¤à¦¿à¦¤",
"1 folder" => "১টি ফোলà§à¦¡à¦¾à¦°",
@@ -48,7 +47,7 @@
"Enable ZIP-download" => "ZIP ডাউনলোড সকà§à¦°à¦¿à§Ÿ কর",
"0 is unlimited" => "০ à¦à¦° অরà§à¦¥ অসীম",
"Maximum input size for ZIP files" => "ZIP ফাইলের ইনপà§à¦Ÿà§‡à¦° সরà§à¦¬à§‹à¦šà§à¦š আকার",
-"Save" => "সংরকà§à¦·à¦£",
+"Save" => "সংরকà§à¦·à¦¨ কর",
"New" => "নতà§à¦¨",
"Text file" => "টেকà§à¦¸à¦Ÿ ফাইল",
"Folder" => "ফোলà§à¦¡à¦¾à¦°",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index a294fbdce4..d92dbeef67 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -3,20 +3,20 @@
"Could not move %s" => " No s'ha pogut moure %s",
"Unable to rename file" => "No es pot canviar el nom del fitxer",
"No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
-"There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
+"There is no error, the file uploaded with success" => "El fitxer s'ha pujat correctament",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el mà xim definit en la directiva upload_max_filesize del php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
-"The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
-"No file was uploaded" => "No s'ha carregat cap fitxer",
-"Missing a temporary folder" => "Falta un fitxer temporal",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML",
+"The uploaded file was only partially uploaded" => "El fitxer només s'ha pujat parcialment",
+"No file was uploaded" => "El fitxer no s'ha pujat",
+"Missing a temporary folder" => "S'ha perdut un fitxer temporal",
"Failed to write to disk" => "Ha fallat en escriure al disc",
"Not enough storage available" => "No hi ha prou espai disponible",
"Invalid directory." => "Directori no và lid.",
"Files" => "Fitxers",
"Delete permanently" => "Esborra permanentment",
-"Delete" => "Esborra",
+"Delete" => "Suprimeix",
"Rename" => "Reanomena",
-"Pending" => "Pendent",
+"Pending" => "Pendents",
"{new_name} already exists" => "{new_name} ja existeix",
"replace" => "substitueix",
"suggest name" => "sugereix un nom",
@@ -55,7 +55,7 @@
"0 is unlimited" => "0 és sense lÃmit",
"Maximum input size for ZIP files" => "Mida mà xima d'entrada per fitxers ZIP",
"Save" => "Desa",
-"New" => "Nova",
+"New" => "Nou",
"Text file" => "Fitxer de text",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index b434da7f28..66c748fbaa 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -16,7 +16,7 @@
"Delete permanently" => "Trvale odstranit",
"Delete" => "Smazat",
"Rename" => "Přejmenovat",
-"Pending" => "NevyÅ™Ãzené",
+"Pending" => "ÄŒekajÃcÃ",
"{new_name} already exists" => "{new_name} již existuje",
"replace" => "nahradit",
"suggest name" => "navrhnout název",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "VaÅ¡e soubory ke staženà se pÅ™ipravujÃ. Pokud jsou velké může to chvÃli trvat.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
"Not enough space available" => "Nedostatek dostupného mÃsta",
"Upload cancelled." => "OdesÃlánà zruÅ¡eno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "ProbÃhá odesÃlánà souboru. OpuÅ¡tÄ›nà stránky vyústà ve zruÅ¡enà nahrávánÃ.",
@@ -41,7 +41,7 @@
"Error" => "Chyba",
"Name" => "Název",
"Size" => "Velikost",
-"Modified" => "Upraveno",
+"Modified" => "Změněno",
"1 folder" => "1 složka",
"{count} folders" => "{count} složky",
"1 file" => "1 soubor",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
"Download" => "Stáhnout",
"Unshare" => "ZruÅ¡it sdÃlenÃ",
-"Upload too large" => "OdesÃlaný soubor je pÅ™ÃliÅ¡ velký",
+"Upload too large" => "Odeslaný soubor je pÅ™ÃliÅ¡ velký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažÃte odeslat, pÅ™ekraÄujà limit velikosti odesÃlánà na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávajÃ, prosÃm Äekejte.",
"Current scanning" => "Aktuálnà prohledávánÃ",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index ff590aa9a3..7c065952ae 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -3,17 +3,16 @@
"Could not move %s" => "Kunne ikke flytte %s",
"Unable to rename file" => "Kunne ikke omdøbe fil",
"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
-"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
+"There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
-"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
-"No file was uploaded" => "Ingen fil uploadet",
-"Missing a temporary folder" => "Manglende midlertidig mappe.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
+"The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
+"No file was uploaded" => "Ingen fil blev uploadet",
+"Missing a temporary folder" => "Mangler en midlertidig mappe",
"Failed to write to disk" => "Fejl ved skrivning til disk.",
"Not enough storage available" => "Der er ikke nok plads til rådlighed",
"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
-"Share" => "Del",
"Delete permanently" => "Slet permanent",
"Delete" => "Slet",
"Rename" => "Omdøb",
@@ -26,15 +25,13 @@
"undo" => "fortryd",
"perform delete operation" => "udfør slet operation",
"1 file uploading" => "1 fil uploades",
-"files uploading" => "uploader filer",
"'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
"File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
-"Not enough space available" => "ikke nok tilgængelig ledig plads ",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
"Upload cancelled." => "Upload afbrudt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
"URL cannot be empty." => "URLen kan ikke være tom.",
@@ -66,7 +63,7 @@
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
"Download" => "Download",
"Unshare" => "Fjern deling",
-"Upload too large" => "Upload er for stor",
+"Upload too large" => "Upload for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
"Current scanning" => "Indlæser",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index f8ad5993af..34f0233486 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -3,18 +3,17 @@
"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" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich übertragen.",
+"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
-"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
-"No file was uploaded" => "Keine Datei konnte übertragen werden.",
-"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
+"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
+"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
+"Missing a temporary folder" => "Temporärer Ordner fehlt.",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicherplatz verfügbar",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
-"Share" => "Teilen",
-"Delete permanently" => "Endgültig löschen",
+"Delete permanently" => "Permanent löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
@@ -42,7 +41,7 @@
"Error" => "Fehler",
"Name" => "Name",
"Size" => "Größe",
-"Modified" => "Geändert",
+"Modified" => "Bearbeitet",
"1 folder" => "1 Ordner",
"{count} folders" => "{count} Ordner",
"1 file" => "1 Datei",
@@ -64,9 +63,9 @@
"Cancel upload" => "Upload abbrechen",
"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
-"Download" => "Download",
-"Unshare" => "Freigabe aufheben",
-"Upload too large" => "Der Upload ist zu groß",
+"Download" => "Herunterladen",
+"Unshare" => "Nicht mehr freigeben",
+"Upload too large" => "Upload zu groß",
"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",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 8a977710a2..8fc1c106d0 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -5,16 +5,15 @@
"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
"There is no error, the file uploaded with success" => "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in der php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
-"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
-"No file was uploaded" => "Keine Datei konnte übertragen werden.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
+"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
+"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
"Missing a temporary folder" => "Der temporäre Ordner fehlt.",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
-"Share" => "Teilen",
-"Delete permanently" => "Endgültig löschen",
+"Delete permanently" => "Entgültig löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
"Upload cancelled." => "Upload abgebrochen.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 8ecb84eb3c..60d63c4142 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -5,7 +5,7 @@
"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το ανεβασμÎνο αÏχείο υπεÏβαίνει το MAX_FILE_SIZE που οÏίζεται στην HTML φόÏμα",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το αÏχείο υπεÏβαίνει την οδηγία μÎγιστου επιτÏÎµÏ€Ï„Î¿Ï Î¼ÎµÎ³Îθους \"MAX_FILE_SIZE\" που Îχει οÏιστεί στην HTML φόÏμα",
"The uploaded file was only partially uploaded" => "Το αÏχείο εστάλει μόνο εν μÎÏει",
"No file was uploaded" => "ΚανÎνα αÏχείο δεν στάλθηκε",
"Missing a temporary folder" => "Λείπει ο Ï€ÏοσωÏινός φάκελος",
@@ -46,7 +46,7 @@
"{count} folders" => "{count} φάκελοι",
"1 file" => "1 αÏχείο",
"{count} files" => "{count} αÏχεία",
-"Upload" => "ΜεταφόÏτωση",
+"Upload" => "Αποστολή",
"File handling" => "ΔιαχείÏιση αÏχείων",
"Maximum upload size" => "ÎœÎγιστο μÎγεθος αποστολής",
"max. possible: " => "μÎγιστο δυνατό:",
@@ -64,7 +64,7 @@
"You don’t have write permissions here." => "Δεν Îχετε δικαιώματα εγγÏαφής εδώ.",
"Nothing in here. Upload something!" => "Δεν υπάÏχει τίποτα εδώ. Ανεβάστε κάτι!",
"Download" => "Λήψη",
-"Unshare" => "Σταμάτημα διαμοιÏασμοÏ",
+"Unshare" => "Διακοπή κοινής χÏήσης",
"Upload too large" => "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ αÏχείο Ï€Ïος αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αÏχεία που Ï€Ïοσπαθείτε να ανεβάσετε υπεÏβαίνουν το μÎγιστο μÎγεθος αποστολής αÏχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αÏχεία σαÏώνονται, παÏακαλώ πεÏιμÎνετε.",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 35683a35f1..3435f43059 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Ne eblis movi %s",
"Unable to rename file" => "Ne eblis alinomigi dosieron",
"No file was uploaded. Unknown error" => "Neniu dosiero alÅutiÄis. Nekonata eraro.",
-"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alÅutiÄis sukcese.",
+"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alÅutiÄis sukcese",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alÅutita superas la regulon upload_max_filesize el php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alÅutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
-"The uploaded file was only partially uploaded" => "la alÅutita dosiero nur parte alÅutiÄis",
-"No file was uploaded" => "Neniu dosiero alÅutiÄis.",
-"Missing a temporary folder" => "Mankas provizora dosierujo.",
+"The uploaded file was only partially uploaded" => "La alÅutita dosiero nur parte alÅutiÄis",
+"No file was uploaded" => "Neniu dosiero estas alÅutita",
+"Missing a temporary folder" => "Mankas tempa dosierujo",
"Failed to write to disk" => "Malsukcesis skribo al disko",
"Invalid directory." => "Nevalida dosierujo.",
"Files" => "Dosieroj",
@@ -22,7 +22,6 @@
"replaced {new_name} with {old_name}" => "anstataÅiÄis {new_name} per {old_name}",
"undo" => "malfari",
"1 file uploading" => "1 dosiero estas alÅutata",
-"files uploading" => "dosieroj estas alÅutataj",
"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\â€, “/â€, “<â€, “>â€, “:â€, “\"â€, “|â€, “?†kaj “*†ne permesatas.",
@@ -58,7 +57,7 @@
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. AlÅutu ion!",
"Download" => "ElÅuti",
"Unshare" => "Malkunhavigi",
-"Upload too large" => "AlÅuto tro larÄa",
+"Upload too large" => "ElÅuto tro larÄa",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alÅuti, transpasas la maksimuman grandon por dosieralÅutoj en ĉi tiu servilo.",
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
"Current scanning" => "Nuna skano"
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index ff782d0c64..e231abe429 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -2,13 +2,13 @@
"Could not move %s - File with this name already exists" => "No se puede mover %s - Ya existe un archivo con ese nombre",
"Could not move %s" => "No se puede mover %s",
"Unable to rename file" => "No se puede renombrar el archivo",
-"No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
-"There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
+"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
+"There is no error, the file uploaded with success" => "No se ha producido ningún error, el archivo se ha subido con éxito",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo que intentas subir solo se subió parcialmente",
"No file was uploaded" => "No se ha subido ningún archivo",
-"Missing a temporary folder" => "Falta la carpeta temporal",
+"Missing a temporary folder" => "Falta un directorio temporal",
"Failed to write to disk" => "La escritura en disco ha fallado",
"Not enough storage available" => "No hay suficiente espacio disponible",
"Invalid directory." => "Directorio invalido.",
@@ -16,7 +16,7 @@
"Delete permanently" => "Eliminar permanentemente",
"Delete" => "Eliminar",
"Rename" => "Renombrar",
-"Pending" => "Pendientes",
+"Pending" => "Pendiente",
"{new_name} already exists" => "{new_name} ya existe",
"replace" => "reemplazar",
"suggest name" => "sugerir nombre",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento esta lleno en un ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Imposible subir su archivo, es un directorio o tiene 0 bytes",
+"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
"Not enough space available" => "No hay suficiente espacio disponible",
"Upload cancelled." => "Subida cancelada.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
@@ -64,8 +64,8 @@
"You don’t have write permissions here." => "No tienes permisos para escribir aquÃ.",
"Nothing in here. Upload something!" => "Aquà no hay nada. ¡Sube algo!",
"Download" => "Descargar",
-"Unshare" => "No compartir",
-"Upload too large" => "bida demasido grande",
+"Unshare" => "Dejar de compartir",
+"Upload too large" => "El archivo es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
"Current scanning" => "Ahora escaneando",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 3248c241db..25c2f4ff69 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -3,12 +3,12 @@
"Could not move %s" => "No se pudo mover %s ",
"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
"No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
-"There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
+"There is no error, the file uploaded with success" => "No se han producido errores, el archivo se ha subido con éxito",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo fue subido parcialmente",
-"No file was uploaded" => "No se subió ningún archivo ",
-"Missing a temporary folder" => "Error en la carpera temporal",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo que intentás subir solo se subió parcialmente",
+"No file was uploaded" => "El archivo no fue subido",
+"Missing a temporary folder" => "Falta un directorio temporal",
"Failed to write to disk" => "Error al escribir en el disco",
"Not enough storage available" => "No hay suficiente capacidad de almacenamiento",
"Invalid directory." => "Directorio invalido.",
@@ -16,7 +16,7 @@
"Delete permanently" => "Borrar de manera permanente",
"Delete" => "Borrar",
"Rename" => "Cambiar nombre",
-"Pending" => "Pendientes",
+"Pending" => "Pendiente",
"{new_name} already exists" => "{new_name} ya existe",
"replace" => "reemplazar",
"suggest name" => "sugerir nombre",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "No hay nada. ¡Subà contenido!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
-"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
+"Upload too large" => "El archivo es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
"Current scanning" => "Escaneo actual",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index fa48cb2cc4..64a2f71b27 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -3,9 +3,9 @@
"Could not move %s" => "%s liigutamine ebaõnnestus",
"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
-"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
+"There is no error, the file uploaded with success" => "Ühtegi viga pole, fail on üles laetud",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse",
"The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
"No file was uploaded" => "Ühtegi faili ei laetud üles",
"Missing a temporary folder" => "Ajutiste failide kaust puudub",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
"Not enough space available" => "Pole piisavalt ruumi",
"Upload cancelled." => "Üleslaadimine tühistati.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 7d938cffd2..8c244babf0 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
-"There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
+"There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
-"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
+"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
"No file was uploaded" => "Ez da fitxategirik igo",
-"Missing a temporary folder" => "Aldi bateko karpeta falta da",
+"Missing a temporary folder" => "Aldi baterako karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
"Invalid directory." => "Baliogabeko karpeta.",
@@ -25,14 +25,13 @@
"undo" => "desegin",
"perform delete operation" => "Ezabatu",
"1 file uploading" => "fitxategi 1 igotzen",
-"files uploading" => "fitxategiak igotzen",
"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
"Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
"Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
"Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
"Not enough space available" => "Ez dago leku nahikorik.",
"Upload cancelled." => "Igoera ezeztatuta",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -65,7 +64,7 @@
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
"Unshare" => "Ez elkarbanatu",
-"Upload too large" => "Igoera handiegia da",
+"Upload too large" => "Igotakoa handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
"Current scanning" => "Orain eskaneatzen ari da",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 10132fdf9e..13ef465199 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -3,19 +3,18 @@
"Could not move %s" => "%s نمی تواند Øرکت کند ",
"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
"No file was uploaded. Unknown error" => "هیچ Ùایلی آپلود نشد.خطای ناشناس",
-"There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موÙقیت آمیز بود",
+"There is no error, the file uploaded with success" => "هیچ خطایی وجود ندارد Ùایل با موÙقیت بار گذاری شد",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "پرونده آپلود شده بیش ازدستور ماکزیمم_Øجم Ùایل_برای آپلود در php.ini استÙاده کرده است.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Øداکثر Øجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
-"The uploaded file was only partially uploaded" => "پرونده بارگذاری شده Ùقط تاØدودی بارگذاری شده",
-"No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
-"Missing a temporary folder" => "یک پوشه موقت گم شده",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Øداکثر Øجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE",
+"The uploaded file was only partially uploaded" => "مقدار Ú©Ù…ÛŒ از Ùایل بارگذاری شده",
+"No file was uploaded" => "هیچ Ùایلی بارگذاری نشده",
+"Missing a temporary folder" => "یک پوشه موقت گم شده است",
"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموÙÙ‚ بود",
"Not enough storage available" => "Ùضای کاÙÛŒ در دسترس نیست",
"Invalid directory." => "Ùهرست راهنما نامعتبر Ù…ÛŒ باشد.",
-"Files" => "پرونده‌ها",
-"Share" => "اشتراک‌گذاری",
+"Files" => "Ùایل ها",
"Delete permanently" => "Øذ٠قطعی",
-"Delete" => "ØØ°Ù",
+"Delete" => "پاک کردن",
"Rename" => "تغییرنام",
"Pending" => "در انتظار",
"{new_name} already exists" => "{نام _جدید} در Øال Øاضر وجود دارد.",
@@ -42,12 +41,12 @@
"Error" => "خطا",
"Name" => "نام",
"Size" => "اندازه",
-"Modified" => "تاریخ",
+"Modified" => "تغییر یاÙته",
"1 folder" => "1 پوشه",
"{count} folders" => "{ شمار} پوشه ها",
"1 file" => "1 پرونده",
"{count} files" => "{ شمار } Ùایل ها",
-"Upload" => "بارگزاری",
+"Upload" => "بارگذاری",
"File handling" => "اداره پرونده ها",
"Maximum upload size" => "Øداکثر اندازه بارگزاری",
"max. possible: " => "Øداکثرمقدارممکن:",
@@ -64,9 +63,9 @@
"Cancel upload" => "متوق٠کردن بار گذاری",
"You don’t have write permissions here." => "شما اجازه ی نوشتن در اینجا را ندارید",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
-"Download" => "دانلود",
+"Download" => "بارگیری",
"Unshare" => "لغو اشتراک",
-"Upload too large" => "سایز Ùایل برای آپلود زیاد است(Ù….تنظیمات در php.ini)",
+"Upload too large" => "Øجم بارگذاری بسیار زیاد است",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Ùایلها بیش از Øد تعیین شده در این سرور هستند\nمترجم:با تغییر Ùایل php,ini میتوان این Ù…Øدودیت را برطر٠کرد",
"Files are being scanned, please wait." => "پرونده ها در Øال بازرسی هستند لطÙا صبر کنید",
"Current scanning" => "بازرسی کنونی",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 08a0718323..b797273d51 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -4,16 +4,14 @@
"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan",
"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
-"Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
"Invalid directory." => "Virheellinen kansio.",
"Files" => "Tiedostot",
-"Share" => "Jaa",
"Delete permanently" => "Poista pysyvästi",
"Delete" => "Poista",
"Rename" => "Nimeä uudelleen",
@@ -30,7 +28,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
"Not enough space available" => "Tilaa ei ole riittävästi",
"Upload cancelled." => "Lähetys peruttu.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
@@ -38,7 +36,7 @@
"Error" => "Virhe",
"Name" => "Nimi",
"Size" => "Koko",
-"Modified" => "Muokattu",
+"Modified" => "Muutettu",
"1 folder" => "1 kansio",
"{count} folders" => "{count} kansiota",
"1 file" => "1 tiedosto",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index f901e6c2f7..093a0b891c 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Impossible de déplacer %s",
"Unable to rename file" => "Impossible de renommer le fichier",
"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
-"There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
+"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été téléversé avec succès",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
-"The uploaded file was only partially uploaded" => "Le fichier envoyé n'a été que partiellement envoyé.",
-"No file was uploaded" => "Pas de fichier envoyé.",
-"Missing a temporary folder" => "Absence de dossier temporaire.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML",
+"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement téléversé",
+"No file was uploaded" => "Aucun fichier n'a été téléversé",
+"Missing a temporary folder" => "Il manque un répertoire temporaire",
"Failed to write to disk" => "Erreur d'écriture sur le disque",
"Not enough storage available" => "Plus assez d'espace de stockage disponible",
"Invalid directory." => "Dossier invalide.",
@@ -16,7 +16,7 @@
"Delete permanently" => "Supprimer de façon définitive",
"Delete" => "Supprimer",
"Rename" => "Renommer",
-"Pending" => "En attente",
+"Pending" => "En cours",
"{new_name} already exists" => "{new_name} existe déjà ",
"replace" => "remplacer",
"suggest name" => "Suggérer un nom",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
"Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de téléverser votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
"Not enough space available" => "Espace disponible insuffisant",
"Upload cancelled." => "Chargement annulé.",
"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
"Unshare" => "Ne plus partager",
-"Upload too large" => "Téléversement trop volumineux",
+"Upload too large" => "Fichier trop volumineux",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
"Current scanning" => "Analyse en cours",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index c371684313..14992f5838 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -2,13 +2,13 @@
"Could not move %s - File with this name already exists" => "Non se moveu %s - Xa existe un ficheiro con ese nome.",
"Could not move %s" => "Non foi posÃbel mover %s",
"Unable to rename file" => "Non é posÃbel renomear o ficheiro",
-"No file was uploaded. Unknown error" => "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
-"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro enviouse correctamente",
+"No file was uploaded. Unknown error" => "Non foi enviado ningún ficheiro. Produciuse un erro descoñecido.",
+"There is no error, the file uploaded with success" => "Non se produciu ningún erro. O ficheiro enviouse correctamente",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente enviado",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
"No file was uploaded" => "Non se enviou ningún ficheiro",
-"Missing a temporary folder" => "Falta o cartafol temporal",
+"Missing a temporary folder" => "Falta un cartafol temporal",
"Failed to write to disk" => "Produciuse un erro ao escribir no disco",
"Not enough storage available" => "Non hai espazo de almacenamento abondo",
"Invalid directory." => "O directorio é incorrecto.",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 3facc4f859..36ba7cc5de 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -1,11 +1,11 @@
<?php $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "×œ× ×”×•×¢×œ×” קובץ. טעות בלתי מזוהה.",
-"There is no error, the file uploaded with success" => "×œ× ×”×ª×¨×—×©×” שגי××”, הקובץ הועלה בהצלחה",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
-"The uploaded file was only partially uploaded" => "הקובץ הועלה ב×ופן חלקי בלבד",
-"No file was uploaded" => "×©×•× ×§×•×‘×¥ ×œ× ×”×•×¢×œ×”",
-"Missing a temporary folder" => "תקיה ×–×ž× ×™×ª חסרה",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה חרג ×ž×”×”× ×—×™×” MAX_FILE_SIZE ×©×¦×•×™× ×” בטופס ×”Ö¾HTML",
+"The uploaded file was only partially uploaded" => "הקובץ שהועלה הועלה בצורה חלקית",
+"No file was uploaded" => "×œ× ×”×•×¢×œ×• קבצי×",
+"Missing a temporary folder" => "תיקייה ×–×ž× ×™×ª חסרה",
"Failed to write to disk" => "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”",
"Files" => "קבצי×",
"Delete permanently" => "מחק לצמיתות",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index d634faee75..a6b83b3d67 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -1,13 +1,12 @@
<?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veliÄinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
-"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
-"No file was uploaded" => "Datoteka nije poslana",
-"Missing a temporary folder" => "Nedostaje privremeni direktorij",
+"There is no error, the file uploaded with success" => "Datoteka je poslana uspješno i bez pogrešaka",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu",
+"The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomiÄno",
+"No file was uploaded" => "Ni jedna datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremena mapa",
"Failed to write to disk" => "Neuspjelo pisanje na disk",
"Files" => "Datoteke",
-"Share" => "Podijeli",
-"Delete" => "Obriši",
+"Delete" => "Briši",
"Rename" => "Promjeni ime",
"Pending" => "U tijeku",
"replace" => "zamjeni",
@@ -15,15 +14,14 @@
"cancel" => "odustani",
"undo" => "vrati",
"1 file uploading" => "1 datoteka se uÄitava",
-"files uploading" => "datoteke se uÄitavaju",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
"Upload cancelled." => "Slanje poništeno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "UÄitavanje datoteke. NapuÅ¡tanjem stranice će prekinuti uÄitavanje.",
"Error" => "Greška",
-"Name" => "Ime",
+"Name" => "Naziv",
"Size" => "VeliÄina",
"Modified" => "Zadnja promjena",
-"Upload" => "UÄitaj",
+"Upload" => "Pošalji",
"File handling" => "datoteka za rukovanje",
"Maximum upload size" => "Maksimalna veliÄina prijenosa",
"max. possible: " => "maksimalna moguća: ",
@@ -37,8 +35,8 @@
"Folder" => "mapa",
"Cancel upload" => "Prekini upload",
"Nothing in here. Upload something!" => "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!",
-"Download" => "Preuzimanje",
-"Unshare" => "Makni djeljenje",
+"Download" => "Preuzmi",
+"Unshare" => "Prekini djeljenje",
"Upload too large" => "Prijenos je preobiman",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokuÅ¡avate prenijeti prelaze maksimalnu veliÄinu za prijenos datoteka na ovom poslužitelju.",
"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo priÄekajte.",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 9a4e519969..103523b65f 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -7,7 +7,7 @@
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra.",
"The uploaded file was only partially uploaded" => "Az eredeti fájlt csak részben sikerült feltölteni.",
-"No file was uploaded" => "Nem töltődött fel állomány",
+"No file was uploaded" => "Nem töltődött fel semmi",
"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
"Failed to write to disk" => "Nem sikerült a lemezre történÅ‘ Ãrás",
"Not enough storage available" => "Nincs elég szabad hely.",
@@ -64,7 +64,7 @@
"You don’t have write permissions here." => "Itt nincs Ãrásjoga.",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
-"Unshare" => "A megosztás visszavonása",
+"Unshare" => "Megosztás visszavonása",
"Upload too large" => "A feltöltés túl nagy",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 457f771e46..b3233cc37d 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
-"No file was uploaded" => "Nulle file esseva incargate.",
+"No file was uploaded" => "Nulle file esseva incargate",
"Missing a temporary folder" => "Manca un dossier temporari",
"Files" => "Files",
"Delete" => "Deler",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 187ccfc67f..3894ce0de9 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -2,7 +2,7 @@
"Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
"Could not move %s" => "Tidak dapat memindahkan %s",
"Unable to rename file" => "Tidak dapat mengubah nama berkas",
-"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
+"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal",
"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau ukurannya 0 byte",
"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
"Upload cancelled." => "Pengunggahan dibatalkan.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
"Download" => "Unduh",
"Unshare" => "Batalkan berbagi",
-"Upload too large" => "Yang diunggah terlalu besar",
+"Upload too large" => "Unggahan terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
"Current scanning" => "Yang sedang dipindai",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 9f54b2efb9..20819e2564 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Impossibile spostare %s",
"Unable to rename file" => "Impossibile rinominare il file",
"No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
-"There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato caricato correttamente",
+"There is no error, the file uploaded with success" => "Non ci sono errori, file caricato con successo",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
-"The uploaded file was only partially uploaded" => "Il file è stato caricato solo parzialmente",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML",
+"The uploaded file was only partially uploaded" => "Il file è stato parzialmente caricato",
"No file was uploaded" => "Nessun file è stato caricato",
-"Missing a temporary folder" => "Manca una cartella temporanea",
+"Missing a temporary folder" => "Cartella temporanea mancante",
"Failed to write to disk" => "Scrittura su disco non riuscita",
"Not enough storage available" => "Spazio di archiviazione insufficiente",
"Invalid directory." => "Cartella non valida.",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
"Not enough space available" => "Spazio disponibile insufficiente",
"Upload cancelled." => "Invio annullato",
"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
"Unshare" => "Rimuovi condivisione",
-"Upload too large" => "Caricamento troppo grande",
+"Upload too large" => "Il file caricato è troppo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
"Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
"Current scanning" => "Scansione corrente",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index afc2f54b6d..402a9f33b3 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -5,10 +5,10 @@
"No file was uploaded. Unknown error" => "ファイルã¯ä½•ã‚‚アップãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã›ã‚“。ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼",
"There is no error, the file uploaded with success" => "エラーã¯ã‚ã‚Šã¾ã›ã‚“。ファイルã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã¯æˆåŠŸã—ã¾ã—ãŸ",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯php.ini ã® upload_max_filesize ã«è¨å®šã•ã‚ŒãŸã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップãƒãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯HTMLフォームã§æŒ‡å®šã•ã‚ŒãŸ MAX_FILE_SIZE ã®åˆ¶é™ã‚’超ãˆã¦ã„ã¾ã™",
-"The uploaded file was only partially uploaded" => "アップãƒãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯ä¸€éƒ¨åˆ†ã ã‘アップãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯HTMLã®ãƒ•ã‚©ãƒ¼ãƒ ã«è¨å®šã•ã‚ŒãŸMAX_FILE_SIZEã«è¨å®šã•ã‚ŒãŸã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™",
+"The uploaded file was only partially uploaded" => "ファイルã¯ä¸€éƒ¨åˆ†ã—ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ",
"No file was uploaded" => "ファイルã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ",
-"Missing a temporary folder" => "一時ä¿å˜ãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
+"Missing a temporary folder" => "テンãƒãƒ©ãƒªãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
"Failed to write to disk" => "ディスクã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ",
"Not enough storage available" => "ストレージã«å分ãªç©ºã容é‡ãŒã‚ã‚Šã¾ã›ã‚“",
"Invalid directory." => "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚",
@@ -16,7 +16,7 @@
"Delete permanently" => "完全ã«å‰Šé™¤ã™ã‚‹",
"Delete" => "削除",
"Rename" => "åå‰ã®å¤‰æ›´",
-"Pending" => "ä¸æ–",
+"Pending" => "ä¿ç•™",
"{new_name} already exists" => "{new_name} ã¯ã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™",
"replace" => "ç½®ãæ›ãˆ",
"suggest name" => "推奨å称",
@@ -41,7 +41,7 @@
"Error" => "エラー",
"Name" => "åå‰",
"Size" => "サイズ",
-"Modified" => "変更",
+"Modified" => "更新日時",
"1 folder" => "1 フォルダ",
"{count} folders" => "{count} フォルダ",
"1 file" => "1 ファイル",
@@ -64,8 +64,8 @@
"You don’t have write permissions here." => "ã‚ãªãŸã«ã¯æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。",
"Nothing in here. Upload something!" => "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。何ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。",
"Download" => "ダウンãƒãƒ¼ãƒ‰",
-"Unshare" => "共有解除",
-"Upload too large" => "アップãƒãƒ¼ãƒ‰ã«ã¯å¤§ãã™ãŽã¾ã™ã€‚",
+"Unshare" => "共有ã—ãªã„",
+"Upload too large" => "ファイルサイズãŒå¤§ãã™ãŽã¾ã™",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップãƒãƒ¼ãƒ‰ã—よã†ã¨ã—ã¦ã„るファイルã¯ã€ã‚µãƒ¼ãƒã§è¦å®šã•ã‚ŒãŸæœ€å¤§ã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™ã€‚",
"Files are being scanned, please wait." => "ファイルをスã‚ャンã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。",
"Current scanning" => "スã‚ャンä¸",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 82b9c5df93..6ea75a2ea9 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -64,7 +64,7 @@
"You don’t have write permissions here." => "თქვენ áƒáƒ გáƒáƒ¥áƒ•áƒ— ჩáƒáƒ¬áƒ”რის უფლებრáƒáƒ¥.",
"Nothing in here. Upload something!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. áƒáƒ¢áƒ•áƒ˜áƒ თე რáƒáƒ›áƒ”!",
"Download" => "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ",
-"Unshare" => "გáƒáƒ£áƒ–იáƒáƒ ებáƒáƒ“ი",
+"Unshare" => "გáƒáƒ–იáƒáƒ ების მáƒáƒ®áƒ¡áƒœáƒ",
"Upload too large" => "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ თი ფáƒáƒ˜áƒšáƒ˜ ძáƒáƒšáƒ˜áƒáƒœ დიდიáƒ",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფáƒáƒ˜áƒšáƒ˜áƒ¡ ზáƒáƒ›áƒ რáƒáƒ›áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ¡áƒáƒª თქვენ áƒáƒžáƒ˜áƒ ებთ, áƒáƒáƒáƒ ბებს სერვერზე დáƒáƒ¨áƒ•áƒ”ბულ მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ›áƒ¡.",
"Files are being scanned, please wait." => "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ”ბის სკáƒáƒœáƒ˜áƒ ებáƒ, გთხáƒáƒ•áƒ— დáƒáƒ”ლáƒáƒ“áƒáƒ—.",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index c35bdd115e..88378bb486 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -3,24 +3,24 @@
"Could not move %s" => "%s í•ëª©ì„ ì´ë”©ì‹œí‚¤ì§€ 못하였ìŒ",
"Unable to rename file" => "íŒŒì¼ ì´ë¦„바꾸기 í• ìˆ˜ ì—†ìŒ",
"No file was uploaded. Unknown error" => "파ì¼ì´ 업로드ë˜ì§€ 않았습니다. ì•Œ 수 없는 오류입니다",
-"There is no error, the file uploaded with success" => "íŒŒì¼ ì—…ë¡œë“œì— ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤.",
+"There is no error, the file uploaded with success" => "ì—…ë¡œë“œì— ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파ì¼ì´ php.iniì˜ upload_max_filesize보다 í½ë‹ˆë‹¤:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 íŒŒì¼ í¬ê¸°ê°€ HTML í¼ì˜ MAX_FILE_SIZE보다 í¼",
-"The uploaded file was only partially uploaded" => "파ì¼ì˜ ì¼ë¶€ë¶„만 업로드ë¨",
-"No file was uploaded" => "파ì¼ì´ 업로드ë˜ì§€ 않았ìŒ",
-"Missing a temporary folder" => "ìž„ì‹œ í´ë”ê°€ ì—†ìŒ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파ì¼ì´ HTML ë¬¸ì„œì— ì§€ì •í•œ MAX_FILE_SIZE보다 ë” í¼",
+"The uploaded file was only partially uploaded" => "파ì¼ì´ 부분ì 으로 업로드ë¨",
+"No file was uploaded" => "ì—…ë¡œë“œëœ íŒŒì¼ ì—†ìŒ",
+"Missing a temporary folder" => "ìž„ì‹œ í´ë”ê°€ 사ë¼ì§",
"Failed to write to disk" => "디스í¬ì— 쓰지 못했습니다",
"Invalid directory." => "올바르지 ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤.",
"Files" => "파ì¼",
"Delete" => "ì‚ì œ",
"Rename" => "ì´ë¦„ 바꾸기",
-"Pending" => "대기 중",
+"Pending" => "보류 중",
"{new_name} already exists" => "{new_name}ì´(ê°€) ì´ë¯¸ 존재함",
"replace" => "바꾸기",
"suggest name" => "ì´ë¦„ ì œì•ˆ",
"cancel" => "취소",
"replaced {new_name} with {old_name}" => "{old_name}ì´(ê°€) {new_name}(으)ë¡œ 대체ë¨",
-"undo" => "ë˜ëŒë¦¬ê¸°",
+"undo" => "실행 취소",
"1 file uploading" => "íŒŒì¼ 1ê°œ 업로드 중",
"'.' is an invalid file name." => "'.' 는 올바르지 ì•Šì€ íŒŒì¼ ì´ë¦„ 입니다.",
"File name cannot be empty." => "íŒŒì¼ ì´ë¦„ì´ ë¹„ì–´ ìžˆì„ ìˆ˜ 없습니다.",
@@ -28,7 +28,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "ì €ìž¥ ê³µê°„ì´ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤. 파ì¼ì„ ì—…ë°ì´íŠ¸í•˜ê±°ë‚˜ ë™ê¸°í™”í• ìˆ˜ 없습니다!",
"Your storage is almost full ({usedSpacePercent}%)" => "ì €ìž¥ ê³µê°„ì´ ê±°ì˜ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤ ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "다운로드가 준비 중입니다. íŒŒì¼ í¬ê¸°ê°€ í¬ë‹¤ë©´ ì‹œê°„ì´ ì˜¤ëž˜ 걸릴 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ë””ë ‰í„°ë¦¬ ë° ë¹ˆ 파ì¼ì€ ì—…ë¡œë“œí• ìˆ˜ 없습니다",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ì´ íŒŒì¼ì€ ë””ë ‰í„°ë¦¬ì´ê±°ë‚˜ 비어 있기 ë•Œë¬¸ì— ì—…ë¡œë“œí• ìˆ˜ 없습니다",
"Not enough space available" => "ì—¬ìœ ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤",
"Upload cancelled." => "업로드가 취소ë˜ì—ˆìŠµë‹ˆë‹¤.",
"File upload is in progress. Leaving the page now will cancel the upload." => "íŒŒì¼ ì—…ë¡œë“œê°€ 진행 중입니다. ì´ íŽ˜ì´ì§€ë¥¼ 벗어나면 업로드가 취소ë©ë‹ˆë‹¤.",
@@ -59,7 +59,7 @@
"Nothing in here. Upload something!" => "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• ìˆ˜ 있습니다!",
"Download" => "다운로드",
"Unshare" => "ê³µìœ í•´ì œ",
-"Upload too large" => "업로드한 파ì¼ì´ 너무 í¼",
+"Upload too large" => "업로드 용량 초과",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ì´ íŒŒì¼ì´ 서버ì—ì„œ 허용하는 최대 업로드 가능 용량보다 í½ë‹ˆë‹¤.",
"Files are being scanned, please wait." => "파ì¼ì„ ê²€ìƒ‰í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤.",
"Current scanning" => "현재 검색",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 948a114acc..6533a12308 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -2,7 +2,7 @@
"There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
"The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
-"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
+"No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
"Missing a temporary folder" => "Et feelt en temporären Dossier",
"Failed to write to disk" => "Konnt net op den Disk schreiwen",
"Files" => "Dateien",
@@ -31,7 +31,7 @@
"Folder" => "Dossier",
"Cancel upload" => "Upload ofbriechen",
"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Download" => "Download",
+"Download" => "Eroflueden",
"Unshare" => "Net méi deelen",
"Upload too large" => "Upload ze grouss",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 199b6978ce..750500a3d5 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -1,8 +1,8 @@
<?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
+"There is no error, the file uploaded with success" => "Klaidų nėra, failas įkeltas sėkmingai",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje",
"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
-"No file was uploaded" => "Nebuvo įkeltas joks failas",
+"No file was uploaded" => "Nebuvo įkeltas nė vienas failas",
"Missing a temporary folder" => "NÄ—ra laikinojo katalogo",
"Failed to write to disk" => "Nepavyko įrašyti į diską",
"Files" => "Failai",
@@ -44,7 +44,7 @@
"Download" => "Atsisiųsti",
"Unshare" => "Nebesidalinti",
"Upload too large" => "Įkėlimui failas per didelis",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje",
"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
"Current scanning" => "Å iuo metu skenuojama"
);
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 99304be9e0..1292514547 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -3,7 +3,7 @@
"Could not move %s" => "NevarÄ“ja pÄrvietot %s",
"Unable to rename file" => "NevarÄ“ja pÄrsaukt datni",
"No file was uploaded. Unknown error" => "Netika augÅ¡upielÄdÄ“ta neviena datne. NezinÄma kļūda",
-"There is no error, the file uploaded with success" => "Viss kÄrtÄ«bÄ, datne augÅ¡upielÄdÄ“ta veiksmÄ«ga",
+"There is no error, the file uploaded with success" => "AugÅ¡upielÄde pabeigta bez kļūdÄm",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "AugÅ¡upielÄdÄ“tÄ datne pÄrsniedz upload_max_filesize norÄdÄ«jumu php.ini datnÄ“:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "AugÅ¡upielÄdÄ“tÄ datne pÄrsniedz MAX_FILE_SIZE norÄdi, kas ir norÄdÄ«ta HTML formÄ",
"The uploaded file was only partially uploaded" => "AugÅ¡upielÄdÄ“tÄ datne ir tikai daļēji augÅ¡upielÄdÄ“ta",
@@ -31,7 +31,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "JÅ«su krÄtuve ir pilna, datnes vairs nevar augÅ¡upielÄdÄ“t vai sinhronizÄ“t!",
"Your storage is almost full ({usedSpacePercent}%)" => "JÅ«su krÄtuve ir gandrÄ«z pilna ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielÄde. Tas var aizņemt kÄdu laiciņu, ja datnes ir lielas.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄ ir 0 baitu liela",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄs izmÄ“rs ir 0 baiti",
"Not enough space available" => "Nepietiek brīvas vietas",
"Upload cancelled." => "AugÅ¡upielÄde ir atcelta.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augÅ¡upielÄde. Pametot lapu tagad, tiks atcelta augÅ¡upielÄde.",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 32e7eadb93..78fed25cf9 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,11 +1,11 @@
<?php $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "Ðиту еден фајл не Ñе вчита. Ðепозната грешка",
-"There is no error, the file uploaded with success" => "Датотеката беше уÑпешно подигната.",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше Ñпецифицирана во HTML формата",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поÑтавена во HTML формата",
"The uploaded file was only partially uploaded" => "Датотеката беше Ñамо делумно подигната.",
-"No file was uploaded" => "Ðе беше подигната датотека.",
-"Missing a temporary folder" => "ÐедоÑтаÑува привремена папка",
+"No file was uploaded" => "Ðе беше подигната датотека",
+"Missing a temporary folder" => "Ðе поÑтои привремена папка",
"Failed to write to disk" => "ÐеуÑпеав да запишам на диÑк",
"Files" => "Датотеки",
"Delete" => "Избриши",
@@ -48,7 +48,7 @@
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
"Download" => "Преземи",
"Unshare" => "Ðе Ñподелувај",
-"Upload too large" => "Фајлот кој Ñе вчитува е преголем",
+"Upload too large" => "Датотеката е премногу голема",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои Ñе обидувате да ги подигнете ја надминуваат макÑималната големина за подигнување датотеки на овој Ñервер.",
"Files are being scanned, please wait." => "Се Ñкенираат датотеки, ве молам почекајте.",
"Current scanning" => "Моментално Ñкенирам"
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 2ce4f16332..a390288b36 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -1,13 +1,12 @@
<?php $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
-"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
-"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
-"No file was uploaded" => "Tiada fail dimuatnaik",
-"Missing a temporary folder" => "Direktori sementara hilang",
+"There is no error, the file uploaded with success" => "Tiada ralat, fail berjaya dimuat naik.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML ",
+"The uploaded file was only partially uploaded" => "Sebahagian daripada fail telah dimuat naik. ",
+"No file was uploaded" => "Tiada fail yang dimuat naik",
+"Missing a temporary folder" => "Folder sementara hilang",
"Failed to write to disk" => "Gagal untuk disimpan",
-"Files" => "Fail-fail",
-"Share" => "Kongsi",
+"Files" => "fail",
"Delete" => "Padam",
"Pending" => "Dalam proses",
"replace" => "ganti",
@@ -15,7 +14,7 @@
"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
"Upload cancelled." => "Muatnaik dibatalkan.",
"Error" => "Ralat",
-"Name" => "Nama",
+"Name" => "Nama ",
"Size" => "Saiz",
"Modified" => "Dimodifikasi",
"Upload" => "Muat naik",
@@ -33,7 +32,7 @@
"Cancel upload" => "Batal muat naik",
"Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
"Download" => "Muat turun",
-"Upload too large" => "Muatnaik terlalu besar",
+"Upload too large" => "Muat naik terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
"Current scanning" => "Imbasan semasa"
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 98f91b3eb5..54042c9124 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,10 +1,10 @@
<?php $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
-"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
-"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
-"No file was uploaded" => "Ingen filer ble lastet opp",
-"Missing a temporary folder" => "Mangler midlertidig mappe",
+"There is no error, the file uploaded with success" => "Det er ingen feil. Filen ble lastet opp.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet",
+"The uploaded file was only partially uploaded" => "Filopplastningen ble bare delvis gjennomført",
+"No file was uploaded" => "Ingen fil ble lastet opp",
+"Missing a temporary folder" => "Mangler en midlertidig mappe",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
"Files" => "Filer",
"Delete permanently" => "Slett permanent",
@@ -18,7 +18,6 @@
"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
"undo" => "angre",
"1 file uploading" => "1 fil lastes opp",
-"files uploading" => "filer lastes opp",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
"Upload cancelled." => "Opplasting avbrutt.",
@@ -49,7 +48,7 @@
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
"Unshare" => "Avslutt deling",
-"Upload too large" => "Filen er for stor",
+"Upload too large" => "Opplasting for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
"Current scanning" => "Pågående skanning"
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index b9a05fdf23..38b55d34d9 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Kon %s niet verplaatsen",
"Unable to rename file" => "Kan bestand niet hernoemen",
"No file was uploaded. Unknown error" => "Er was geen bestand geladen. Onbekende fout",
-"There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
+"There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
-"The uploaded file was only partially uploaded" => "Het bestand is gedeeltelijk geüpload",
-"No file was uploaded" => "Er is geen bestand geüpload",
-"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier",
+"The uploaded file was only partially uploaded" => "Het bestand is slechts gedeeltelijk geupload",
+"No file was uploaded" => "Geen bestand geüpload",
+"Missing a temporary folder" => "Een tijdelijke map mist",
"Failed to write to disk" => "Schrijven naar schijf mislukt",
"Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
"Invalid directory." => "Ongeldige directory.",
@@ -16,7 +16,7 @@
"Delete permanently" => "Verwijder definitief",
"Delete" => "Verwijder",
"Rename" => "Hernoem",
-"Pending" => "In behandeling",
+"Pending" => "Wachten",
"{new_name} already exists" => "{new_name} bestaat al",
"replace" => "vervang",
"suggest name" => "Stel een naam voor",
@@ -32,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
"Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
+"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
"Not enough space available" => "Niet genoeg ruimte beschikbaar",
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
@@ -40,13 +40,13 @@
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
"Error" => "Fout",
"Name" => "Naam",
-"Size" => "Grootte",
-"Modified" => "Aangepast",
+"Size" => "Bestandsgrootte",
+"Modified" => "Laatst aangepast",
"1 folder" => "1 map",
"{count} folders" => "{count} mappen",
"1 file" => "1 bestand",
"{count} files" => "{count} bestanden",
-"Upload" => "Uploaden",
+"Upload" => "Upload",
"File handling" => "Bestand",
"Maximum upload size" => "Maximale bestandsgrootte voor uploads",
"max. possible: " => "max. mogelijk: ",
@@ -54,7 +54,7 @@
"Enable ZIP-download" => "Zet ZIP-download aan",
"0 is unlimited" => "0 is ongelimiteerd",
"Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
-"Save" => "Bewaren",
+"Save" => "Opslaan",
"New" => "Nieuw",
"Text file" => "Tekstbestand",
"Folder" => "Map",
@@ -63,9 +63,9 @@
"Cancel upload" => "Upload afbreken",
"You don’t have write permissions here." => "U hebt hier geen schrijfpermissies.",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
-"Download" => "Downloaden",
-"Unshare" => "Stop met delen",
-"Upload too large" => "Upload is te groot",
+"Download" => "Download",
+"Unshare" => "Stop delen",
+"Upload too large" => "Bestanden te groot",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",
"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
"Current scanning" => "Er wordt gescand",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 2042e7bf8a..8f32dc012e 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,74 +1,23 @@
<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet",
-"Could not move %s" => "Klarte ikkje å flytta %s",
-"Unable to rename file" => "Klarte ikkje å endra filnamnet",
-"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
"No file was uploaded" => "Ingen filer vart lasta opp",
"Missing a temporary folder" => "Manglar ei mellombels mappe",
-"Failed to write to disk" => "Klarte ikkje å skriva til disk",
-"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
-"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
-"Share" => "Del",
-"Delete permanently" => "Slett for godt",
"Delete" => "Slett",
-"Rename" => "Endra namn",
-"Pending" => "Under vegs",
-"{new_name} already exists" => "{new_name} finst allereie",
-"replace" => "byt ut",
-"suggest name" => "føreslå namn",
-"cancel" => "avbryt",
-"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
-"undo" => "angre",
-"perform delete operation" => "utfør sletting",
-"1 file uploading" => "1 fil lastar opp",
-"files uploading" => "filer lastar opp",
-"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
-"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
-"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
-"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte",
-"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
-"Upload cancelled." => "Opplasting avbroten.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten.",
-"URL cannot be empty." => "URL-en kan ikkje vera tom.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
"Error" => "Feil",
"Name" => "Namn",
"Size" => "Storleik",
"Modified" => "Endra",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
"Upload" => "Last opp",
-"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
-"max. possible: " => "maks. moglege:",
-"Needed for multi-file and folder downloads." => "Naudsynt for fleirfils- og mappenedlastingar.",
-"Enable ZIP-download" => "Skru på ZIP-nedlasting",
-"0 is unlimited" => "0 er ubegrensa",
-"Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
"Save" => "Lagre",
"New" => "Ny",
"Text file" => "Tekst fil",
"Folder" => "Mappe",
-"From link" => "Frå lenkje",
-"Deleted files" => "Sletta filer",
-"Cancel upload" => "Avbryt opplasting",
-"You don’t have write permissions here." => "Du har ikkje skriverettar her.",
"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
"Download" => "Last ned",
-"Unshare" => "Udel",
"Upload too large" => "For stor opplasting",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren.",
-"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
-"Current scanning" => "Køyrande skanning",
-"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
);
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 03b46444b6..b1ef621658 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -14,7 +14,6 @@
"cancel" => "anulla",
"undo" => "defar",
"1 file uploading" => "1 fichièr al amontcargar",
-"files uploading" => "fichièrs al amontcargar",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
"Upload cancelled." => "Amontcargar anullat.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
@@ -37,7 +36,7 @@
"Cancel upload" => " Anulla l'amontcargar",
"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
"Download" => "Avalcarga",
-"Unshare" => "Pas partejador",
+"Unshare" => "Non parteja",
"Upload too large" => "Amontcargament tròp gròs",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 8b7f665cee..e9a78e2f44 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Nie można było przenieść %s",
"Unable to rename file" => "Nie można zmienić nazwy pliku",
"No file was uploaded. Unknown error" => "Żaden plik nie został załadowany. Nieznany błąd",
-"There is no error, the file uploaded with success" => "Nie było błędów, plik wysłano poprawnie.",
+"There is no error, the file uploaded with success" => "Przesłano plik",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML",
"The uploaded file was only partially uploaded" => "Załadowany plik został wysłany tylko częściowo.",
-"No file was uploaded" => "Nie wysłano żadnego pliku",
-"Missing a temporary folder" => "Brak folderu tymczasowego",
+"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 dostępnego miejsca",
"Invalid directory." => "Zła ścieżka.",
@@ -46,7 +46,7 @@
"{count} folders" => "Ilość folderów: {count}",
"1 file" => "1 plik",
"{count} files" => "Ilość plików: {count}",
-"Upload" => "Wyślij",
+"Upload" => "Prześlij",
"File handling" => "ZarzÄ…dzanie plikami",
"Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
"max. possible: " => "maks. możliwy:",
@@ -57,15 +57,15 @@
"Save" => "Zapisz",
"New" => "Nowy",
"Text file" => "Plik tekstowy",
-"Folder" => "Folder",
+"Folder" => "Katalog",
"From link" => "Z odnośnika",
"Deleted files" => "Pliki usunięte",
"Cancel upload" => "Anuluj wysyłanie",
"You don’t have write permissions here." => "Nie masz uprawnień do zapisu w tym miejscu.",
"Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
"Download" => "Pobierz",
-"Unshare" => "Zatrzymaj współdzielenie",
-"Upload too large" => "Åadowany plik jest za duży",
+"Unshare" => "Nie udostępniaj",
+"Upload too large" => "Wysyłany plik ma za duży rozmiar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
"Current scanning" => "Aktualnie skanowane",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index bd038806d2..ad8f37c24f 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -3,11 +3,11 @@
"Could not move %s" => "ImpossÃvel mover %s",
"Unable to rename file" => "ImpossÃvel renomear arquivo",
"No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Sem erros, o arquivo foi enviado com sucesso",
+"There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente enviado",
-"No file was uploaded" => "Nenhum arquivo enviado",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O arquivo foi transferido parcialmente",
+"No file was uploaded" => "Nenhum arquivo foi transferido",
"Missing a temporary folder" => "Pasta temporária não encontrada",
"Failed to write to disk" => "Falha ao escrever no disco",
"Not enough storage available" => "Espaço de armazenamento insuficiente",
@@ -46,7 +46,7 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 arquivo",
"{count} files" => "{count} arquivos",
-"Upload" => "Upload",
+"Upload" => "Carregar",
"File handling" => "Tratamento de Arquivo",
"Maximum upload size" => "Tamanho máximo para carregar",
"max. possible: " => "max. possÃvel:",
@@ -54,7 +54,7 @@
"Enable ZIP-download" => "Habilitar ZIP-download",
"0 is unlimited" => "0 para ilimitado",
"Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
-"Save" => "Guardar",
+"Save" => "Salvar",
"New" => "Novo",
"Text file" => "Arquivo texto",
"Folder" => "Pasta",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
"Unshare" => "Descompartilhar",
-"Upload too large" => "Upload muito grande",
+"Upload too large" => "Arquivo muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
"Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
"Current scanning" => "Scanning atual",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index b799a4b81a..c06108cf2b 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -3,18 +3,18 @@
"Could not move %s" => "Não foi possÃvel move o ficheiro %s",
"Unable to rename file" => "Não foi possÃvel renomear o ficheiro",
"No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
+"There is no error, the file uploaded with success" => "Sem erro, ficheiro enviado com sucesso",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
-"No file was uploaded" => "Nenhum ficheiro foi submetido",
-"Missing a temporary folder" => "Está a faltar a pasta temporária",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
+"No file was uploaded" => "Não foi enviado nenhum ficheiro",
+"Missing a temporary folder" => "Falta uma pasta temporária",
"Failed to write to disk" => "Falhou a escrita no disco",
"Not enough storage available" => "Não há espaço suficiente em disco",
"Invalid directory." => "Directório Inválido",
"Files" => "Ficheiros",
"Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Eliminar",
+"Delete" => "Apagar",
"Rename" => "Renomear",
"Pending" => "Pendente",
"{new_name} already exists" => "O nome {new_name} já existe",
@@ -46,11 +46,11 @@
"{count} folders" => "{count} pastas",
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
-"Upload" => "Carregar",
+"Upload" => "Enviar",
"File handling" => "Manuseamento de ficheiros",
"Maximum upload size" => "Tamanho máximo de envio",
"max. possible: " => "max. possivel: ",
-"Needed for multi-file and folder downloads." => "Necessário para multi download de ficheiros e pastas",
+"Needed for multi-file and folder downloads." => "Necessário para descarregamento múltiplo de ficheiros e pastas",
"Enable ZIP-download" => "Permitir descarregar em ficheiro ZIP",
"0 is unlimited" => "0 é ilimitado",
"Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
@@ -65,8 +65,8 @@
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
"Unshare" => "Deixar de partilhar",
-"Upload too large" => "Upload muito grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
+"Upload too large" => "Envio muito grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor.",
"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
"Current scanning" => "Análise actual",
"Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index b2b6ee4963..e3cab80fbc 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -3,18 +3,15 @@
"Could not move %s" => "Nu s-a putut muta %s",
"Unable to rename file" => "Nu s-a putut redenumi fișierul",
"No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
-"There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
+"There is no error, the file uploaded with success" => "Nicio eroare, fișierul a fost încărcat cu succes",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
-"No file was uploaded" => "Nu a fost încărcat nici un fișier",
-"Missing a temporary folder" => "Lipsește un director temporar",
+"No file was uploaded" => "Niciun fișier încărcat",
+"Missing a temporary folder" => "Lipsește un dosar temporar",
"Failed to write to disk" => "Eroare la scriere pe disc",
-"Not enough storage available" => "Nu este suficient spațiu disponibil",
"Invalid directory." => "Director invalid.",
"Files" => "Fișiere",
-"Share" => "Partajează",
-"Delete permanently" => "Stergere permanenta",
"Delete" => "Șterge",
"Rename" => "Redenumire",
"Pending" => "În așteptare",
@@ -24,14 +21,10 @@
"cancel" => "anulare",
"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
"undo" => "Anulează ultima acțiune",
-"perform delete operation" => "efectueaza operatiunea de stergere",
"1 file uploading" => "un fișier se încarcă",
-"files uploading" => "fișiere se încarcă",
"'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
"File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
-"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
"Not enough space available" => "Nu este suficient spațiu disponibil",
@@ -47,7 +40,7 @@
"{count} folders" => "{count} foldare",
"1 file" => "1 fisier",
"{count} files" => "{count} fisiere",
-"Upload" => "Încărcare",
+"Upload" => "Încarcă",
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
"max. possible: " => "max. posibil:",
@@ -55,20 +48,17 @@
"Enable ZIP-download" => "Activează descărcare fișiere compresate",
"0 is unlimited" => "0 e nelimitat",
"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
-"Save" => "Salvează",
+"Save" => "Salvare",
"New" => "Nou",
"Text file" => "Fișier text",
"Folder" => "Dosar",
"From link" => "de la adresa",
-"Deleted files" => "Sterge fisierele",
"Cancel upload" => "Anulează încărcarea",
-"You don’t have write permissions here." => "Nu ai permisiunea de a sterge fisiere aici.",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
-"Unshare" => "Anulare partajare",
+"Unshare" => "Anulează partajarea",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
-"Current scanning" => "ÃŽn curs de scanare",
-"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
+"Current scanning" => "ÃŽn curs de scanare"
);
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 1bf3b174b8..37f2e083c4 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Ðевозможно перемеÑтить %s",
"Unable to rename file" => "Ðевозможно переименовать файл",
"No file was uploaded. Unknown error" => "Файл не был загружен. ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°",
-"There is no error, the file uploaded with success" => "Файл загружен уÑпешно.",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превоÑходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
-"The uploaded file was only partially uploaded" => "Файл загружен чаÑтично",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме",
+"The uploaded file was only partially uploaded" => "Файл был загружен не полноÑтью",
"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "ОтÑутÑтвует Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°",
+"Missing a temporary folder" => "Ðевозможно найти временную папку",
"Failed to write to disk" => "Ошибка запиÑи на диÑк",
"Not enough storage available" => "ÐедоÑтаточно доÑтупного меÑта в хранилище",
"Invalid directory." => "Ðеправильный каталог.",
@@ -25,28 +25,27 @@
"undo" => "отмена",
"perform delete operation" => "выполнÑетÑÑ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ",
"1 file uploading" => "загружаетÑÑ 1 файл",
-"files uploading" => "файлы загружаютÑÑ",
"'.' is an invalid file name." => "'.' - неправильное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°.",
"File name cannot be empty." => "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ðеправильное имÑ, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопуÑтимы.",
"Your storage is full, files can not be updated or synced anymore!" => "Ваше диÑковое проÑтранÑтво полноÑтью заполнено, произведите очиÑтку перед загрузкой новых файлов.",
"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Загрузка началаÑÑŒ. Ðто может потребовать много времени, еÑли файл большого размера.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо Ñто не файл, а директориÑ.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ðе удаетÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ файл размером 0 байт в каталог",
"Not enough space available" => "ÐедоÑтаточно Ñвободного меÑта",
"Upload cancelled." => "Загрузка отменена.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процеÑÑе загрузки. Покинув Ñтраницу вы прервёте загрузку.",
"URL cannot be empty." => "СÑылка не может быть пуÑтой.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ðеправильное Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' зарезервировано.",
"Error" => "Ошибка",
-"Name" => "ИмÑ",
+"Name" => "Ðазвание",
"Size" => "Размер",
"Modified" => "Изменён",
"1 folder" => "1 папка",
"{count} folders" => "{count} папок",
"1 file" => "1 файл",
"{count} files" => "{count} файлов",
-"Upload" => "Загрузка",
+"Upload" => "Загрузить",
"File handling" => "Управление файлами",
"Maximum upload size" => "МакÑимальный размер загружаемого файла",
"max. possible: " => "макÑ. возможно: ",
@@ -64,8 +63,8 @@
"You don’t have write permissions here." => "У Ð²Ð°Ñ Ð½ÐµÑ‚ разрешений на запиÑÑŒ здеÑÑŒ.",
"Nothing in here. Upload something!" => "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
-"Unshare" => "Закрыть общий доÑтуп",
-"Upload too large" => "Файл Ñлишком велик",
+"Unshare" => "Отменить публикацию",
+"Upload too large" => "Файл Ñлишком большой",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Ð’Ñ‹ пытаетеÑÑŒ загрузить, превышают лимит Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² на Ñтом Ñервере.",
"Files are being scanned, please wait." => "Подождите, файлы ÑканируютÑÑ.",
"Current scanning" => "Текущее Ñканирование",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 351021a9f8..dfcca6f689 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,14 +1,13 @@
<?php $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "ගොනුවක් උඩුගචනොවුනි. නොහà·à¶³à·’නු දà·à·‚යක්",
-"There is no error, the file uploaded with success" => "දà·à·‚යක් නොමà·à¶. à·ƒà·à¶»à·Šà¶®à¶šà·€ ගොනුව උඩුගචකෙරුණි",
+"There is no error, the file uploaded with success" => "නිවà·à¶»à¶¯à·’ à·€ ගොනුව උඩුගචකෙරිනි",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩුගචකළ ගොනුවේ විà·à·à¶½à¶à·Šà·€à¶º HTML පà·à¶»à¶¸à¶ºà·š නියම කළ ඇà¶à·’ MAX_FILE_SIZE විà·à·à¶½à¶à·Šà·€à¶ºà¶§ වඩ෠වà·à¶©à·’ය",
"The uploaded file was only partially uploaded" => "උඩුගචකළ ගොනුවේ කොටසක් පමණක් උඩුගචවිය",
-"No file was uploaded" => "ගොනුවක් උඩුගචනොවුණි",
-"Missing a temporary folder" => "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් අà¶à·”රුදහන්",
+"No file was uploaded" => "කිසිදු ගොනවක් උඩුගචනොවිනි",
+"Missing a temporary folder" => "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් සොයà·à¶œà¶ නොහà·à¶š",
"Failed to write to disk" => "à¶à·à¶§à·’ගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’",
"Files" => "ගොනු",
-"Share" => "බෙද෠හද෠ගන්න",
-"Delete" => "මක෠දමන්න",
+"Delete" => "මකන්න",
"Rename" => "නà·à·€à¶ නම් කරන්න",
"replace" => "ප්â€à¶»à¶à·’ස්ථà·à¶´à¶±à¶º කරන්න",
"suggest name" => "නමක් යà·à¶¢à¶±à· කරන්න",
@@ -24,7 +23,7 @@
"Modified" => "වෙනස් කළ",
"1 folder" => "1 ෆොල්ඩරයක්",
"1 file" => "1 ගොනුවක්",
-"Upload" => "උඩුගචකරන්න",
+"Upload" => "උඩුගචකිරීම",
"File handling" => "ගොනු පරිහරණය",
"Maximum upload size" => "උඩුගචකිරීමක උපරිම ප්â€à¶»à¶¸à·à¶«à¶º",
"max. possible: " => "à·„à·à¶šà·’ උපරිමය:",
@@ -39,7 +38,7 @@
"From link" => "යොමුවෙන්",
"Cancel upload" => "උඩුගචකිරීම අà¶à·Š හරින්න",
"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමà·à¶. යමක් උඩුගචකරන්න",
-"Download" => "බà·à¶±à·Šà¶±",
+"Download" => "බà·à¶œà¶ කිරීම",
"Unshare" => "නොබෙදු",
"Upload too large" => "උඩුගචකිරීම විà·à·à¶½ à·€à·à¶©à·’ය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගචකිරීමට à¶à·à¶à·Š කරන ගොනු මෙම සේවà·à¶¯à·à¶ºà¶šà¶ºà· උඩුගචකිරීමට ඉඩදී ඇà¶à·’ උපරිම ගොනු විà·à·à¶½à¶à·Šà·€à¶ºà¶§ වඩ෠වà·à¶©à·’ය",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 42eb3b1238..ee89a4c7d6 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -5,18 +5,18 @@
"No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
"There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor predÄil konfiguraÄnú direktÃvu upload_max_filesize v súbore php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ukladaný súbor prekraÄuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
-"The uploaded file was only partially uploaded" => "Ukladaný súbor sa nahral len ÄiastoÄne",
-"No file was uploaded" => "Žiadny súbor nebol uložený",
-"Missing a temporary folder" => "Chýba doÄasný prieÄinok",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný súbor presiahol MAX_FILE_SIZE direktÃvu, ktorá bola Å¡pecifikovaná v HTML formulári",
+"The uploaded file was only partially uploaded" => "Nahrávaný súbor bol iba ÄiastoÄne nahraný",
+"No file was uploaded" => "Žiaden súbor nebol nahraný",
+"Missing a temporary folder" => "Chýbajúci doÄasný prieÄinok",
"Failed to write to disk" => "Zápis na disk sa nepodaril",
"Not enough storage available" => "Nedostatok dostupného úložného priestoru",
"Invalid directory." => "Neplatný prieÄinok",
"Files" => "Súbory",
"Delete permanently" => "Zmazať trvalo",
-"Delete" => "Zmazať",
+"Delete" => "Odstrániť",
"Rename" => "Premenovať",
-"Pending" => "Prebieha",
+"Pending" => "Čaká sa",
"{new_name} already exists" => "{new_name} už existuje",
"replace" => "nahradiť",
"suggest name" => "pomôcť s menom",
@@ -32,14 +32,14 @@
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "VaÅ¡e sÅ¥ahovanie sa pripravuje. Ak sú sÅ¥ahované súbory veľké, môže to chvÃľu trvaÅ¥.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslaÅ¥ Váš súbor, pretože je to prieÄinok, alebo je jeho veľkosÅ¥ 0 bajtov",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahraÅ¥ súbor lebo je to prieÄinok alebo má 0 bajtov.",
"Not enough space available" => "Nie je k dispozÃcii dostatok miesta",
"Upload cancelled." => "Odosielanie zrušené",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zrušà práve prebiehajúce odosielanie súboru.",
"URL cannot be empty." => "URL nemôže byť prázdne",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno prieÄinka. PoužÃvanie mena 'Shared' je vyhradené len pre Owncloud",
"Error" => "Chyba",
-"Name" => "Názov",
+"Name" => "Meno",
"Size" => "Veľkosť",
"Modified" => "Upravené",
"1 folder" => "1 prieÄinok",
@@ -55,7 +55,7 @@
"0 is unlimited" => "0 znamená neobmedzené",
"Maximum input size for ZIP files" => "NajväÄÅ¡ia veľkosÅ¥ ZIP súborov",
"Save" => "Uložiť",
-"New" => "Nová",
+"New" => "Nový",
"Text file" => "Textový súbor",
"Folder" => "PrieÄinok",
"From link" => "Z odkazu",
@@ -63,9 +63,9 @@
"Cancel upload" => "Zrušiť odosielanie",
"You don’t have write permissions here." => "Nemáte oprávnenie na zápis.",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte nieÄo!",
-"Download" => "SÅ¥ahovanie",
-"Unshare" => "Zrušiť zdieľanie",
-"Upload too large" => "Nahrávanie je prÃliÅ¡ veľké",
+"Download" => "Stiahnuť",
+"Unshare" => "Nezdielať",
+"Upload too large" => "Odosielaný súbor je prÃliÅ¡ veľký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažÃte nahraÅ¥, presahujú maximálnu veľkosÅ¥ pre nahratie súborov na tento server.",
"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
"Current scanning" => "Práve prezerané",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 44c33d62fb..65d463e13d 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -2,19 +2,18 @@
"Could not move %s - File with this name already exists" => "Ni mogoÄe premakniti %s - datoteka s tem imenom že obstaja",
"Could not move %s" => "Ni mogoÄe premakniti %s",
"Unable to rename file" => "Ni mogoÄe preimenovati datoteke",
-"No file was uploaded. Unknown error" => "Ni poslane datoteke. Neznana napaka.",
-"There is no error, the file uploaded with success" => "Datoteka je uspešno naložena.",
+"No file was uploaded. Unknown error" => "Ni poslane nobene datoteke. Neznana napaka.",
+"There is no error, the file uploaded with success" => "Datoteka je uspešno poslana.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je doloÄena z možnostjo upload_max_filesize v datoteki php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo doloÄa parameter najveÄje dovoljene velikosti v obrazcu HTML.",
-"The uploaded file was only partially uploaded" => "Poslan je le del datoteke.",
-"No file was uploaded" => "Ni poslane datoteke",
+"The uploaded file was only partially uploaded" => "Datoteka je le delno naložena",
+"No file was uploaded" => "Nobena datoteka ni bila naložena",
"Missing a temporary folder" => "Manjka zaÄasna mapa",
"Failed to write to disk" => "Pisanje na disk je spodletelo",
"Not enough storage available" => "Na voljo ni dovolj prostora",
"Invalid directory." => "Neveljavna mapa.",
"Files" => "Datoteke",
-"Share" => "Souporaba",
-"Delete permanently" => "IzbriÅ¡i dokonÄno",
+"Delete permanently" => "Izbriši trajno",
"Delete" => "Izbriši",
"Rename" => "Preimenuj",
"Pending" => "V Äakanju ...",
@@ -33,7 +32,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni veÄ mogoÄe posodabljati in usklajevati!",
"Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, Äe je datoteka zelo velika.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "PoÅ¡iljanja ni mogoÄe izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "PoÅ¡iljanje ni mogoÄe, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
"Not enough space available" => "Na voljo ni dovolj prostora.",
"Upload cancelled." => "Pošiljanje je preklicano.",
"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
@@ -56,7 +55,7 @@
"0 is unlimited" => "0 predstavlja neomejeno vrednost",
"Maximum input size for ZIP files" => "NajveÄja vhodna velikost za datoteke ZIP",
"Save" => "Shrani",
-"New" => "Novo",
+"New" => "Nova",
"Text file" => "Besedilna datoteka",
"Folder" => "Mapa",
"From link" => "Iz povezave",
@@ -65,7 +64,7 @@
"You don’t have write permissions here." => "Za to mesto ni ustreznih dovoljenj za pisanje.",
"Nothing in here. Upload something!" => "Tukaj Å¡e ni niÄesar. Najprej je treba kakÅ¡no datoteko poslati v oblak!",
"Download" => "Prejmi",
-"Unshare" => "PrekliÄi souporabo",
+"Unshare" => "Odstrani iz souporabe",
"Upload too large" => "PrekoraÄenje omejitve velikosti",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo najveÄjo dovoljeno velikost na strežniku.",
"Files are being scanned, please wait." => "Poteka preuÄevanje datotek, poÄakajte ...",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 9c7e4e1fc0..50d587ebb2 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -39,7 +39,7 @@
"URL cannot be empty." => "ÐдреÑа не може бити празна.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ÐеиÑправно име фаÑцикле. ФаÑцикла „Shared“ је резервиÑана за ownCloud.",
"Error" => "Грешка",
-"Name" => "Име",
+"Name" => "Ðазив",
"Size" => "Величина",
"Modified" => "Измењено",
"1 folder" => "1 фаÑцикла",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 54e4275ebb..125788ad13 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -3,12 +3,12 @@
"Could not move %s" => "Kan inte flytta %s",
"Unable to rename file" => "Kan inte byta namn på filen",
"No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
-"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
+"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär",
"The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvis uppladdad",
-"No file was uploaded" => "Ingen fil laddades upp",
-"Missing a temporary folder" => "En temporär mapp saknas",
+"No file was uploaded" => "Ingen fil blev uppladdad",
+"Missing a temporary folder" => "Saknar en tillfällig mapp",
"Failed to write to disk" => "Misslyckades spara till disk",
"Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
"Invalid directory." => "Felaktig mapp.",
@@ -25,14 +25,13 @@
"undo" => "Ã¥ngra",
"perform delete operation" => "utför raderingen",
"1 file uploading" => "1 filuppladdning",
-"files uploading" => "filer laddas upp",
"'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
"File name cannot be empty." => "Filnamn kan inte vara tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller synkas!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
"Upload cancelled." => "Uppladdning avbruten.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index e5f7bbdf9b..b88379043d 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -7,8 +7,7 @@
"Missing a temporary folder" => "ஒர௠தறà¯à®•à®¾à®²à®¿à®•à®®à®¾à®© கோபà¯à®ªà¯à®±à¯ˆà®¯à¯ˆ காணவிலà¯à®²à¯ˆ",
"Failed to write to disk" => "வடà¯à®Ÿà®¿à®²à¯ எழà¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ",
"Files" => "கோபà¯à®ªà¯à®•à®³à¯",
-"Share" => "பகிரà¯à®µà¯",
-"Delete" => "நீகà¯à®•à¯à®•",
+"Delete" => "அழிகà¯à®•",
"Rename" => "பெயரà¯à®®à®¾à®±à¯à®±à®®à¯",
"Pending" => "நிலà¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³",
"{new_name} already exists" => "{new_name} à®à®±à¯à®•à®©à®µà¯‡ உளà¯à®³à®¤à¯",
@@ -39,7 +38,7 @@
"Enable ZIP-download" => "ZIP பதிவிறகà¯à®•à®²à¯ˆ இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•",
"0 is unlimited" => "0 ஆனத௠எலà¯à®²à¯ˆà®¯à®±à¯à®±à®¤à¯",
"Maximum input size for ZIP files" => "ZIP கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© ஆககà¯à®•à¯‚டிய உளà¯à®³à¯€à®Ÿà¯à®Ÿà¯ அளவà¯",
-"Save" => "சேமிகà¯à®• ",
+"Save" => "சேமிகà¯à®•",
"New" => "பà¯à®¤à®¿à®¯",
"Text file" => "கோபà¯à®ªà¯ உரை",
"Folder" => "கோபà¯à®ªà¯à®±à¯ˆ",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index a879dba85a..0e7d32bf12 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -3,12 +3,12 @@
"Could not move %s" => "ไม่สามารถย้าย %s ได้",
"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่à¸à¹„ฟล์ได้",
"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูà¸à¸à¸±à¸žà¹‚หลด เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดที่ไม่ทราบสาเหตุ",
-"There is no error, the file uploaded with success" => "ไม่พบข้à¸à¸œà¸´à¸”พลาดใดๆ, ไฟล์ถูà¸à¸à¸±à¸žà¹‚หลดเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§",
+"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดไฟล์ใหà¸à¹ˆà¹€à¸à¸´à¸™à¸ˆà¸³à¸™à¸§à¸™à¸—ี่à¸à¸³à¸«à¸™à¸”ไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูà¸à¸£à¸°à¸šà¸¸à¹„ว้ในรูปà¹à¸šà¸šà¸‚à¸à¸‡ HTML",
-"The uploaded file was only partially uploaded" => "ไฟล์ถูà¸à¸à¸±à¸žà¹‚หลดได้เพียงบางส่วนเท่านั้น",
-"No file was uploaded" => "ไม่มีไฟล์ที่ถูà¸à¸à¸±à¸žà¹‚หลด",
-"Missing a temporary folder" => "โฟลเดà¸à¸£à¹Œà¸Šà¸±à¹ˆà¸§à¸„ราวเà¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดเà¸à¸´à¸™à¸„ำสั่ง MAX_FILE_SIZE ที่ระบุเà¸à¸²à¹„ว้ในรูปà¹à¸šà¸šà¸„ำสั่งในภาษา HTML",
+"The uploaded file was only partially uploaded" => "ไฟล์ที่à¸à¸±à¸žà¹‚หลดยังไม่ได้ถูà¸à¸à¸±à¸žà¹‚หลดà¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¸šà¸¹à¸£à¸“์",
+"No file was uploaded" => "ยังไม่มีไฟล์ที่ถูà¸à¸à¸±à¸žà¹‚หลด",
+"Missing a temporary folder" => "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£à¸Šà¸±à¹ˆà¸§à¸„ราวเà¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢",
"Failed to write to disk" => "เขียนข้à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”ิสà¸à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
"Not enough storage available" => "เหลืà¸à¸žà¸·à¹‰à¸™à¸—ี่ไม่เพียงสำหรับใช้งาน",
"Invalid directory." => "ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡",
@@ -24,14 +24,13 @@
"undo" => "เลิà¸à¸—ำ",
"perform delete operation" => "ดำเนินà¸à¸²à¸£à¸•à¸²à¸¡à¸„ำสั่งลบ",
"1 file uploading" => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚หลดไฟล์ 1 ไฟล์",
-"files uploading" => "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์",
"'.' is an invalid file name." => "'.' เป็นชื่à¸à¹„ฟล์ที่ไม่ถูà¸à¸•à¹‰à¸à¸‡",
"File name cannot be empty." => "ชื่à¸à¹„ฟล์ไม่สามารถเว้นว่างได้",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่à¸à¸—ี่ใช้ไม่ถูà¸à¸•à¹‰à¸à¸‡, '\\', '/', '<', '>', ':', '\"', '|', '?' à¹à¸¥à¸° '*' ไม่ได้รับà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้",
"Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„ุณเต็มà¹à¸¥à¹‰à¸§ ไม่สามารถà¸à¸±à¸žà¹€à¸”ทหรืà¸à¸œà¸ªà¸²à¸™à¹„ฟล์ต่างๆได้à¸à¸µà¸à¸•à¹ˆà¸à¹„ป",
"Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„ุณใà¸à¸¥à¹‰à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”าวน์โหลดข้à¸à¸¡à¸¹à¸¥ หาà¸à¹„ฟล์มีขนาดใหà¸à¹ˆ à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„รู่",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถà¸à¸±à¸žà¹‚หลดไฟล์ขà¸à¸‡à¸„ุณได้ เนื่à¸à¸‡à¸ˆà¸²à¸à¹„ฟล์ดังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µà¹ˆ หรืภมีขนาดไฟล์ 0 ไบต์",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถà¸à¸±à¸žà¹‚หลดไฟล์ขà¸à¸‡à¸„ุณได้ เนื่à¸à¸‡à¸ˆà¸²à¸à¹„ฟล์ดังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¸«à¸£à¸·à¸à¸¡à¸µà¸‚นาด 0 ไบต์",
"Not enough space available" => "มีพื้นที่เหลืà¸à¹„ม่เพียงพà¸",
"Upload cancelled." => "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸",
"File upload is in progress. Leaving the page now will cancel the upload." => "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”ำเนินà¸à¸²à¸£ à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸™à¸µà¹‰à¸ˆà¸°à¸—ำให้à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸",
@@ -40,7 +39,7 @@
"Error" => "ข้à¸à¸œà¸´à¸”พลาด",
"Name" => "ชื่à¸",
"Size" => "ขนาด",
-"Modified" => "à¹à¸à¹‰à¹„ขà¹à¸¥à¹‰à¸§",
+"Modified" => "ปรับปรุงล่าสุด",
"1 folder" => "1 โฟลเดà¸à¸£à¹Œ",
"{count} folders" => "{count} โฟลเดà¸à¸£à¹Œ",
"1 file" => "1 ไฟล์",
@@ -61,7 +60,7 @@
"Cancel upload" => "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚หลด",
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆà¸à¸¢à¸¹à¹ˆà¸—ี่นี่ à¸à¸£à¸¸à¸“าà¸à¸±à¸žà¹‚หลดไฟล์!",
"Download" => "ดาวน์โหลด",
-"Unshare" => "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ",
+"Unshare" => "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥",
"Upload too large" => "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¹„ป",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะà¸à¸±à¸žà¹‚หลดมีขนาดเà¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸‚นาดสูงสุดที่à¸à¸³à¸«à¸™à¸”ไว้ให้à¸à¸±à¸žà¹‚หลดได้สำหรับเซิร์ฟเวà¸à¸£à¹Œà¸™à¸µà¹‰",
"Files are being scanned, please wait." => "ไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 17275e4753..84da59cee0 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -3,12 +3,12 @@
"Could not move %s" => "%s taşınamadı",
"Unable to rename file" => "Dosya adı değiştirilemedi",
"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
-"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
+"There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
-"The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
-"No file was uploaded" => "Hiç dosya gönderilmedi",
-"Missing a temporary folder" => "Geçici dizin eksik",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor",
+"The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi",
+"No file was uploaded" => "Hiç dosya yüklenmedi",
+"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.",
@@ -39,7 +39,7 @@
"URL cannot be empty." => "URL boÅŸ olamaz.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.",
"Error" => "Hata",
-"Name" => "Ä°sim",
+"Name" => "Ad",
"Size" => "Boyut",
"Modified" => "DeÄŸiÅŸtirilme",
"1 folder" => "1 dizin",
@@ -65,7 +65,7 @@
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
"Download" => "Ä°ndir",
"Unshare" => "Paylaşılmayan",
-"Upload too large" => "Yükleme çok büyük",
+"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",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index db3120645f..65b4ec1433 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -46,7 +46,7 @@
"{count} folders" => "{count} папок",
"1 file" => "1 файл",
"{count} files" => "{count} файлів",
-"Upload" => "Вивантажити",
+"Upload" => "Відвантажити",
"File handling" => "Робота з файлами",
"Maximum upload size" => "МакÑимальний розмір відвантажень",
"max. possible: " => "макÑ.можливе:",
@@ -64,7 +64,7 @@
"You don’t have write permissions here." => "У Ð²Ð°Ñ Ñ‚ÑƒÑ‚ немає прав на запиÑ.",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
-"Unshare" => "Закрити доÑтуп",
+"Unshare" => "Заборонити доÑтуп",
"Upload too large" => "Файл занадто великий",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтеÑÑŒ відвантажити перевищують макÑимальний дозволений розмір файлів на цьому Ñервері.",
"Files are being scanned, please wait." => "Файли ÑкануютьÑÑ, зачекайте, будь-лаÑка.",
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index aa87eeda38..e13a623fec 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Error" => "ایرر",
-"Unshare" => "شئیرنگ ختم کریں"
+"Error" => "ایرر"
);
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 7a67f66b30..73cf154492 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -5,9 +5,9 @@
"No file was uploaded. Unknown error" => "Không có táºp tin nà o được tải lên. Lá»—i không xác định",
"There is no error, the file uploaded with success" => "Không có lá»—i, các táºp tin đã được tải lên thà nh công",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Táºp tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
-"The uploaded file was only partially uploaded" => "Các táºp tin được tải lên chỉ tải lên được má»™t phần",
-"No file was uploaded" => "Chưa có file nà o được tải lên",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "KÃch thÆ°á»›c những táºp tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
+"The uploaded file was only partially uploaded" => "Táºp tin tải lên má»›i chỉ tải lên được má»™t phần",
+"No file was uploaded" => "Không có táºp tin nà o được tải lên",
"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
"Failed to write to disk" => "Không thể ghi ",
"Not enough storage available" => "Không đủ không gian lưu trữ",
@@ -16,7 +16,7 @@
"Delete permanently" => "Xóa vĩnh vễn",
"Delete" => "Xóa",
"Rename" => "Sá»a tên",
-"Pending" => "Äang chá»",
+"Pending" => "Chá»",
"{new_name} already exists" => "{new_name} đã tồn tại",
"replace" => "thay thế",
"suggest name" => "tên gợi ý",
@@ -25,14 +25,13 @@
"undo" => "lùi lại",
"perform delete operation" => "thực hiện việc xóa",
"1 file uploading" => "1 tệp tin đang được tải lên",
-"files uploading" => "tệp tin đang được tải lên",
"'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
"File name cannot be empty." => "Tên file không được rỗng",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
"Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
"Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên táºp tin của bạn ,nó nhÆ° là má»™t thÆ° mục hoặc có 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên táºp tin nà y do nó là má»™t thÆ° mục hoặc kÃch thÆ°á»›c táºp tin bằng 0 byte",
"Upload cancelled." => "Hủy tải lên",
"File upload is in progress. Leaving the page now will cancel the upload." => "Táºp tin tải lên Ä‘ang được xá» lý. Nếu bạn rá»i khá»i trang bây giá» sẽ hủy quá trình nà y.",
"URL cannot be empty." => "URL không được để trống.",
@@ -61,8 +60,8 @@
"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 vá»",
-"Unshare" => "BỠchia sẻ",
+"Download" => "Tải xuống",
+"Unshare" => "Không chia sẽ",
"Upload too large" => "Táºp tin tải lên quá lá»›n",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các táºp tin bạn Ä‘ang tải lên vượt quá kÃch thÆ°á»›c tối Ä‘a cho phép trên máy chủ .",
"Files are being scanned, please wait." => "Táºp tin Ä‘ang được quét ,vui lòng chá».",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index f0de736e7a..33e21e544c 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,15 +1,15 @@
<?php $TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "æ²¡æœ‰ä¸Šä¼ æ–‡ä»¶ã€‚æœªçŸ¥é”™è¯¯",
-"There is no error, the file uploaded with success" => "æ–‡ä»¶ä¸Šä¼ æˆåŠŸ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº† HTML è¡¨æ ¼ä¸æŒ‡å®šçš„ MAX_FILE_SIZE 选项",
-"The uploaded file was only partially uploaded" => "æ–‡ä»¶éƒ¨åˆ†ä¸Šä¼ ",
-"No file was uploaded" => "æ²¡æœ‰ä¸Šä¼ æ–‡ä»¶",
-"Missing a temporary folder" => "缺失临时文件夹",
+"There is no error, the file uploaded with success" => "没有任何错误,æ–‡ä»¶ä¸Šä¼ æˆåŠŸäº†",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†HTML表å•æŒ‡å®šçš„MAX_FILE_SIZE",
+"The uploaded file was only partially uploaded" => "文件åªæœ‰éƒ¨åˆ†è¢«ä¸Šä¼ ",
+"No file was uploaded" => "æ²¡æœ‰ä¸Šä¼ å®Œæˆçš„文件",
+"Missing a temporary folder" => "丢失了一个临时文件夹",
"Failed to write to disk" => "写ç£ç›˜å¤±è´¥",
"Files" => "文件",
"Delete" => "åˆ é™¤",
"Rename" => "é‡å‘½å",
-"Pending" => "ç‰å¾…ä¸",
+"Pending" => "Pending",
"{new_name} already exists" => "{new_name} å·²å˜åœ¨",
"replace" => "替æ¢",
"suggest name" => "推èå称",
@@ -17,13 +17,12 @@
"replaced {new_name} with {old_name}" => "已用 {old_name} æ›¿æ¢ {new_name}",
"undo" => "撤销",
"1 file uploading" => "1 个文件æ£åœ¨ä¸Šä¼ ",
-"files uploading" => "个文件æ£åœ¨ä¸Šä¼ ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ä¸èƒ½ä¸Šä¼ 您的文件，由于它是文件夹或者为空文件",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› 为它是个文件夹或者大å°ä¸º0",
"Upload cancelled." => "ä¸Šä¼ å–消了",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件æ£åœ¨ä¸Šä¼ 。关é—页é¢ä¼šå–æ¶ˆä¸Šä¼ ã€‚",
"URL cannot be empty." => "网å€ä¸èƒ½ä¸ºç©ºã€‚",
"Error" => "出错",
-"Name" => "å称",
+"Name" => "åå—",
"Size" => "大å°",
"Modified" => "修改日期",
"1 folder" => "1 个文件夹",
@@ -46,8 +45,8 @@
"Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
"Nothing in here. Upload something!" => "这里没有东西.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!",
"Download" => "下载",
-"Unshare" => "å–消分享",
-"Upload too large" => "ä¸Šä¼ è¿‡å¤§",
+"Unshare" => "å–消共享",
+"Upload too large" => "ä¸Šä¼ çš„æ–‡ä»¶å¤ªå¤§äº†",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ä½ æ£åœ¨è¯•å›¾ä¸Šä¼ 的文件超过了æ¤æœåŠ¡å™¨æ”¯æŒçš„最大的文件大å°.",
"Files are being scanned, please wait." => "æ£åœ¨æ‰«æ文件,请ç¨å€™.",
"Current scanning" => "æ£åœ¨æ‰«æ"
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 3ba7a78007..8740298c62 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -3,11 +3,11 @@
"Could not move %s" => "æ— æ³•ç§»åŠ¨ %s",
"Unable to rename file" => "æ— æ³•é‡å‘½å文件",
"No file was uploaded. Unknown error" => "æ²¡æœ‰æ–‡ä»¶è¢«ä¸Šä¼ ã€‚æœªçŸ¥é”™è¯¯",
-"There is no error, the file uploaded with success" => "æ–‡ä»¶ä¸Šä¼ æˆåŠŸï¼Œæ²¡æœ‰é”™è¯¯å‘生",
+"There is no error, the file uploaded with success" => "没有å‘ç”Ÿé”™è¯¯ï¼Œæ–‡ä»¶ä¸Šä¼ æˆåŠŸã€‚",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ä¸Šä¼ æ–‡ä»¶å¤§å°å·²è¶…过php.iniä¸upload_max_filesize所规定的值",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ä¸Šä¼ çš„æ–‡ä»¶é•¿åº¦è¶…å‡ºäº† HTML 表å•ä¸ MAX_FILE_SIZE çš„é™åˆ¶",
-"The uploaded file was only partially uploaded" => "å·²ä¸Šä¼ æ–‡ä»¶åªä¸Šä¼ 了部分（ä¸å®Œæ•´ï¼‰",
-"No file was uploaded" => "æ²¡æœ‰æ–‡ä»¶è¢«ä¸Šä¼ ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†åœ¨HTML 表å•ä¸æŒ‡å®šçš„MAX_FILE_SIZE",
+"The uploaded file was only partially uploaded" => "åªä¸Šä¼ 了文件的一部分",
+"No file was uploaded" => "æ–‡ä»¶æ²¡æœ‰ä¸Šä¼ ",
"Missing a temporary folder" => "缺少临时目录",
"Failed to write to disk" => "写入ç£ç›˜å¤±è´¥",
"Not enough storage available" => "没有足够的å˜å‚¨ç©ºé—´",
@@ -16,7 +16,7 @@
"Delete permanently" => "æ°¸ä¹…åˆ é™¤",
"Delete" => "åˆ é™¤",
"Rename" => "é‡å‘½å",
-"Pending" => "ç‰å¾…",
+"Pending" => "æ“作ç‰å¾…ä¸",
"{new_name} already exists" => "{new_name} å·²å˜åœ¨",
"replace" => "替æ¢",
"suggest name" => "建议å称",
@@ -31,7 +31,7 @@
"Your storage is full, files can not be updated or synced anymore!" => "您的å˜å‚¨ç©ºé—´å·²æ»¡ï¼Œæ–‡ä»¶å°†æ— 法更新或åŒæ¥ï¼",
"Your storage is almost full ({usedSpacePercent}%)" => "您的å˜å‚¨ç©ºé—´å³å°†ç”¨å®Œ ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "下载æ£åœ¨å‡†å¤‡ä¸ã€‚如果文件较大å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚",
-"Unable to upload your file as it is a directory or has 0 bytes" => "æ— æ³•ä¸Šä¼ æ‚¨çš„æ–‡ä»¶ï¼Œæ–‡ä»¶å¤¹æˆ–è€…ç©ºæ–‡ä»¶",
+"Unable to upload your file as it is a directory or has 0 bytes" => "æ— æ³•ä¸Šä¼ æ–‡ä»¶ï¼Œå› ä¸ºå®ƒæ˜¯ä¸€ä¸ªç›®å½•æˆ–è€…å¤§å°ä¸º 0 å—节",
"Not enough space available" => "没有足够å¯ç”¨ç©ºé—´",
"Upload cancelled." => "ä¸Šä¼ å·²å–消",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件æ£åœ¨ä¸Šä¼ ä¸ã€‚现在离开æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ 动作被å–消。",
@@ -63,7 +63,7 @@
"You don’t have write permissions here." => "您没有写æƒé™",
"Nothing in here. Upload something!" => "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼",
"Download" => "下载",
-"Unshare" => "å–消共享",
+"Unshare" => "å–消分享",
"Upload too large" => "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您æ£å°è¯•ä¸Šä¼ 的文件超过了æ¤æœåŠ¡å™¨å¯ä»¥ä¸Šä¼ 的最大容é‡é™åˆ¶",
"Files are being scanned, please wait." => "文件æ£åœ¨è¢«æ‰«æ，请ç¨å€™ã€‚",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index b576253f4f..69fcb94e68 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -34,7 +34,7 @@
value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
<input type="file" id="file_upload_start" name='files[]'/>
- <a href="#" class="svg"></a>
+ <a href="#" class="svg" onclick="return false;"></a>
</form>
</div>
<?php if ($_['trash'] ): ?>
@@ -46,6 +46,7 @@
<div id="uploadprogressbar"></div>
<input type="button" class="stop" style="display:none"
value="<?php p($l->t('Cancel upload'));?>"
+ onclick="javascript:Files.cancelUploads();"
/>
</div>
</div>
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e27054f0ec..25c2d091c4 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -45,12 +45,7 @@ class Hooks {
$view = new \OC_FilesystemView( '/' );
- $userHome = \OC_User::getHome($params['uid']);
- $dataDir = str_replace('/'.$params['uid'], '', $userHome);
-
- \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $dataDir .'/public-keys'), '/public-keys/' );
-
- $util = new Util( $view, $params['uid'] );
+ $util = new Util( $view, $params['uid'] );
// Check files_encryption infrastructure is ready for action
if ( ! $util->ready() ) {
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index ce9fe38996..0c661353a7 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "L'encriptació de fitxers està activada.",
"The following file types will not be encrypted:" => "Els tipus de fitxers següents no s'encriptaran:",
"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents de l'encriptatge:",
-"None" => "cap"
+"None" => "Cap"
);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index bcf0ca5ad6..cdcd8a40b2 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Dateiverschlüsselung ist aktiviert",
"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
"Exclude the following file types from encryption:" => "Schließe die folgenden Dateitypen von der Verschlüsselung aus:",
-"None" => "Nichts"
+"None" => "Keine"
);
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 71fd7d9671..4f08b98eb2 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
"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" => "Nichts"
+"None" => "Keine"
);
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 82a4c92ec2..0031a73194 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Η κÏυπτογÏάφηση αÏχείων είναι ενεÏγή.",
"The following file types will not be encrypted:" => "Οι παÏακάτω Ï„Ïποι αÏχείων δεν θα κÏυπτογÏαφηθοÏν:",
"Exclude the following file types from encryption:" => "ΕξαίÏεση των παÏακάτω Ï„Ïπων αÏχείων από την κÏυπτογÏάφηση:",
-"None" => "Τίποτα"
+"None" => "Καμία"
);
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 7e3b7611ff..5a22b65728 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Fitxategien enkriptazioa gaituta dago.",
"The following file types will not be encrypted:" => "Hurrengo fitxategi motak ez dira enkriptatuko:",
"Exclude the following file types from encryption:" => "Baztertu hurrengo fitxategi motak enkriptatzetik:",
-"None" => "Ezer"
+"None" => "Bat ere ez"
);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index c717134526..9ab9bc492a 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "La cifratura dei file è abilitata.",
"The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
"Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
-"None" => "Nessuno"
+"None" => "Nessuna"
);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 836f545359..2fa86f454f 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Szyfrowanie plików jest włączone",
"The following file types will not be encrypted:" => "Poniższe typy plików nie będą szyfrowane:",
"Exclude the following file types from encryption:" => "Wyłącz poniższe typy plików z szyfrowania:",
-"None" => "Nic"
+"None" => "Brak"
);
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index b41c6ed315..28807db72c 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "A criptografia de arquivos está ativada.",
"The following file types will not be encrypted:" => "Os seguintes tipos de arquivo não serão criptografados:",
"Exclude the following file types from encryption:" => "Excluir os seguintes tipos de arquivo da criptografia:",
-"None" => "Nada"
+"None" => "Nenhuma"
);
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index f07dec621d..22c1e3da37 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Шифрование файла включено.",
"The following file types will not be encrypted:" => "Следующие типы файлов не будут зашифрованы:",
"Exclude the following file types from encryption:" => "ИÑключить Ñледующие типы файлов из шифрованных:",
-"None" => "Ðет новоÑтей"
+"None" => "Ðичего"
);
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index aaea9da21b..bebb623471 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Šifrovanie súborov nastavené.",
"The following file types will not be encrypted:" => "Uvedené typy súborov nebudú šifrované:",
"Exclude the following file types from encryption:" => "Nešifrovať uvedené typy súborov",
-"None" => "Žiadny"
+"None" => "Žiadne"
);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 30c0324a98..e46d249118 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
"Encryption" => "à¸à¸²à¸£à¹€à¸‚้ารหัส",
-"None" => "ไม่มี"
+"None" => "ไม่ต้à¸à¸‡"
);
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 40d4b1d0fe..0a88d1b2db 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -3,5 +3,5 @@
"File encryption is enabled." => "Mã hóa file đã mở",
"The following file types will not be encrypted:" => "Loại file sau sẽ không được mã hóa",
"Exclude the following file types from encryption:" => "Việc mã hóa không bao gồm loại file sau",
-"None" => "Không gì cả"
+"None" => "Không có gì hết"
);
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 4a85048ba4..7f9572f426 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -21,6 +21,7 @@ use OCA\Encryption;
// This has to go here because otherwise session errors arise, and the private
// encryption key needs to be saved in the session
+\OC_User::login( 'admin', 'admin' );
/**
* @note It would be better to use Mockery here for mocking out the session
@@ -36,7 +37,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// reset backend
\OC_User::useBackend('database');
- // set content for encrypting / decrypting in tests
+ // set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
$this->dataShort = 'hats';
$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
@@ -59,17 +60,13 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init($this->userId, '/');
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
-
- $params['uid'] = $this->userId;
- $params['password'] = $this->pass;
- OCA\Encryption\Hooks::login($params);
}
function tearDown() {
}
- function testGenerateKey() {
+ function testGenerateKey() {
# TODO: use more accurate (larger) string length for test confirmation
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 33ca29997b..81034be54b 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -19,7 +19,7 @@ use OCA\Encryption;
// This has to go here because otherwise session errors arise, and the private
// encryption key needs to be saved in the session
-//\OC_User::login( 'admin', 'admin' );
+\OC_User::login( 'admin', 'admin' );
class Test_Keymanager extends \PHPUnit_Framework_TestCase {
@@ -52,10 +52,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init( $this->userId, '/' );
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
-
- $params['uid'] = $this->userId;
- $params['password'] = $this->pass;
- OCA\Encryption\Hooks::login($params);
+
}
function tearDown(){
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 633cc9e4fc..ba82ac80ea 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -1,4 +1,4 @@
-<?php
+// <?php
// /**
// * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
// * This file is licensed under the Affero General Public License version 3 or
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index e3ec0860fa..0659b468a3 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -24,6 +24,8 @@ $loader->register();
use \Mockery as m;
use OCA\Encryption;
+\OC_User::login( 'admin', 'admin' );
+
class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function setUp() {
@@ -60,10 +62,6 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init( $this->userId, '/' );
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
- $params['uid'] = $this->userId;
- $params['password'] = $this->pass;
- OCA\Encryption\Hooks::login($params);
-
$mockView = m::mock('OC_FilesystemView');
$this->util = new Encryption\Util( $mockView, $this->userId );
@@ -77,9 +75,6 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
/**
* @brief test that paths set during User construction are correct
- *
- *
- *
*/
function testKeyPaths() {
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index a53bfe48bc..06837d5085 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,5 @@
<?php $TRANSLATIONS = array(
"Groups" => "مجموعات",
"Users" => "المستخدمين",
-"Delete" => "إلغاء"
+"Delete" => "ØØ°Ù"
);
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 0f032df9f0..07ccd50074 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -12,7 +12,7 @@
"All Users" => "সমসà§à¦¤ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
"Groups" => "গোষà§à¦ ীসমূহ",
"Users" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
-"Delete" => "মà§à¦›à§‡",
+"Delete" => "মà§à¦›à§‡ ফেল",
"Enable User External Storage" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° বাহà§à¦¯à¦¿à¦• সংরকà§à¦·à¦£à¦¾à¦—ার সকà§à¦°à¦¿à§Ÿ কর",
"Allow users to mount their own external storage" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦°à¦•à§‡ তাদের নিজসà§à¦¬ বাহà§à¦¯à¦¿à¦• সংরকà§à¦·à¦¨à¦¾à¦—ার সাউনà§à¦Ÿ করতে অনà§à¦®à§‹à¦¦à¦¨ দাও",
"SSL root certificates" => "SSL রà§à¦Ÿ সনদপতà§à¦°",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index e3b245babf..aa9304d330 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -17,7 +17,7 @@
"All Users" => "Tots els usuaris",
"Groups" => "Grups",
"Users" => "Usuaris",
-"Delete" => "Esborra",
+"Delete" => "Elimina",
"Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
"Allow users to mount their own external storage" => "Permet als usuaris muntar el seu emmagatzemament extern propi",
"SSL root certificates" => "Certificats SSL root",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 8dfa0eafbb..2418377221 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> Die Curl-Unterstützung in PHP ist nicht aktiviert oder installiert. Das Einbinden von ownCloud / WebDav der GoogleDrive-Freigaben ist nicht möglich. Bitte Deinen Systemadminstrator um die Installation. ",
"External Storage" => "Externer Speicher",
"Folder name" => "Ordnername",
"External storage" => "Externer Speicher",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 8a8ae37ffd..d55c0c6909 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Achtung:</b> Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.",
"External Storage" => "Externer Speicher",
"Folder name" => "Ordnername",
"External storage" => "Externer Speicher",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 62703b08fb..6c519a1b41 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Σφάλμα Ïυθμίζωντας αποθήκευση Google Drive ",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Î Ïοσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η Ï€ÏοσάÏτηση CIFS/SMB. ΠαÏακαλώ ενημεÏώστε τον διαχειÏιστή συστήματος να το εγκαταστήσει.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Î Ïοσοχή:</b> Η υποστήÏιξη FTP στην PHP δεν ενεÏγοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η Ï€ÏοσάÏτηση FTP. ΠαÏακαλώ ενημεÏώστε τον διαχειÏιστή συστήματος να το εγκαταστήσει.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<Î Ïοειδοποίηση </b> Η υποστήÏιξη του συστήματος Curl στο PHP δεν είναι ενεÏγοποιημÎνη ή εγκαταστημÎνη. Η αναπαÏαγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. ΠαÏακαλώ Ïωτήστε τον διαχειÏιστλη του συστήματος για την εγκατάσταση. ",
"External Storage" => "ΕξωτεÏικό Αποθηκευτικό ÎœÎσο",
"Folder name" => "Όνομα φακÎλου",
"External storage" => "ΕξωτεÏική αποθήκευση",
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index 5c332690bf..da22f41032 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -17,7 +17,7 @@
"All Users" => "Todos los usuarios",
"Groups" => "Grupos",
"Users" => "Usuarios",
-"Delete" => "Eliminar",
+"Delete" => "Eliiminar",
"Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
"SSL root certificates" => "RaÃz de certificados SSL ",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 465201df4d..5d1eb0887b 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -5,8 +5,7 @@
"Please provide a valid Dropbox app key and secret." => "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
"Error configuring Google Drive storage" => "Viga Google Drive'i salvestusruumi seadistamisel",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Hoiatus:</b> PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Hoiatus:</b> FTP tugi puudub PHP paigalduses. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
"External Storage" => "Väline salvestuskoht",
"Folder name" => "Kausta nimi",
"External storage" => "Väline andmehoidla",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 5006133a7b..c42c89f857 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Attention :</b> Le support de Curl n'est pas activé ou installé dans PHP. Le montage de ownCloud / WebDAV ou GoogleDrive n'est pas possible. Contactez votre administrateur système pour l'installer.",
"External Storage" => "Stockage externe",
"Folder name" => "Nom du dossier",
"External storage" => "Stockage externe",
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 4e78227ec4..2a62cad3fe 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Folder name" => "Dossiers Numm:",
"Groups" => "Gruppen",
-"Users" => "Benotzer",
"Delete" => "Läschen"
);
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index ded5a861a8..ad3eda9747 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van ownCloud / WebDAV of GoogleDrive is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
"External Storage" => "Externe opslag",
"Folder name" => "Mapnaam",
"External storage" => "Externe opslag",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index bc3c356a51..a358d56913 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Erro ao configurar armazenamento do Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> \"smbclient\" não está instalado. ImpossÃvel montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. ImpossÃvel montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b> Aviso: </b> O suport a Curl em PHP não está habilitado ou instalado. A montagem do ownCloud / WebDAV ou GoogleDrive não é possÃvel. Por favor, solicite ao seu administrador do sistema instalá-lo.",
"External Storage" => "Armazenamento Externo",
"Folder name" => "Nome da pasta",
"External storage" => "Armazenamento Externo",
@@ -18,7 +17,7 @@
"All Users" => "Todos os Usuários",
"Groups" => "Grupos",
"Users" => "Usuários",
-"Delete" => "Excluir",
+"Delete" => "Remover",
"Enable User External Storage" => "Habilitar Armazenamento Externo do Usuário",
"Allow users to mount their own external storage" => "Permitir usuários a montar seus próprios armazenamentos externos",
"SSL root certificates" => "Certificados SSL raÃz",
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index ed23b4cca8..5747205dc0 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -6,14 +6,11 @@
"Error configuring Google Drive storage" => "Eroare la configurarea mediului de stocare Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Atentie:</b> Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!",
"External Storage" => "Stocare externă",
"Folder name" => "Denumire director",
-"External storage" => "Stocare externă",
"Configuration" => "Configurație",
"Options" => "Opțiuni",
"Applicable" => "Aplicabil",
-"Add storage" => "Adauga stocare",
"None set" => "Niciunul",
"All Users" => "Toți utilizatorii",
"Groups" => "Grupuri",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index d2c5292bac..46b73a67f0 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Ошибка при наÑтройке хранилища Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не уÑтановлен. Подключение по CIFS/SMB невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы уÑтановить его.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы включить.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка Curl в PHP не включена или не уÑтановлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. ПопроÑите вашего ÑиÑтемного админиÑтратора уÑтановить его.",
"External Storage" => "Внешний ноÑитель",
"Folder name" => "Ð˜Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸",
"External storage" => "Внешний ноÑитель данных",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 33edcb9d4c..af6b7b4ae6 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -6,7 +6,6 @@
"Error configuring Google Drive storage" => "Chyba pri konfigurácii úložiska Google drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Upozornenie:</b> \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Upozornenie:</b> Podpora FTP v PHP nie je povolená alebo nainštalovaná. Nie je možné pripojenie oddielov FTP. Požiadajte administrátora systému, nech ho nainštaluje.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Varovanie:</b> nie je nainÅ¡talovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, Äi GoogleDrive. ProsÃm požiadajte svojho administrátora systému, nech ju nainÅ¡taluje.",
"External Storage" => "Externé úložisko",
"Folder name" => "Meno prieÄinka",
"External storage" => "Externé úložisko",
@@ -18,7 +17,7 @@
"All Users" => "VÅ¡etci použÃvatelia",
"Groups" => "Skupiny",
"Users" => "PoužÃvatelia",
-"Delete" => "Zmazať",
+"Delete" => "Odstrániť",
"Enable User External Storage" => "Povoliť externé úložisko",
"Allow users to mount their own external storage" => "PovoliÅ¥ použÃvateľom pripojiÅ¥ ich vlastné externé úložisko",
"SSL root certificates" => "Koreňové SSL certifikáty",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 09b91b913e..4ff2eed3bf 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -5,8 +5,7 @@
"Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven kljuÄ programa in kodo za Dropbox",
"Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> paket \"smbclient\" ni nameÅ¡Äen. Priklapljanje pogonov CIFS/SMB ne bo mogoÄe.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> podpora FTP v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje pogonov FTP zato ne bo mogoÄe.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> podpora za Curl v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje toÄke ownCloud / WebDAV ali GoogleDrive zato ne bo mogoÄe. Zahtevane pakete je treba pred uporabo namestiti.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> podpora FTP v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje pogonov FTP zato ni mogoÄe.",
"External Storage" => "Zunanja podatkovna shramba",
"Folder name" => "Ime mape",
"External storage" => "Zunanja shramba",
@@ -19,7 +18,7 @@
"Groups" => "Skupine",
"Users" => "Uporabniki",
"Delete" => "Izbriši",
-"Enable User External Storage" => "OmogoÄi zunanjo uporabniÅ¡ko podatkovno shrambo",
+"Enable User External Storage" => "OmogoÄi uporabniÅ¡ko zunanjo podatkovno shrambo",
"Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe",
"SSL root certificates" => "Korenska potrdila SSL",
"Import Root Certificate" => "Uvozi korensko potrdilo"
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index a8314dcef0..873b555348 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,26 +1,16 @@
<?php $TRANSLATIONS = array(
-"Access granted" => "å…許å˜å–",
-"Error configuring Dropbox storage" => "è¨å®š Dropbox 儲å˜æ™‚發生錯誤",
-"Grant access" => "å…許å˜å–",
-"Please provide a valid Dropbox app key and secret." => "è«‹æ供有效的 Dropbox app key å’Œ app secret 。",
-"Error configuring Google Drive storage" => "è¨å®š Google Drive 儲å˜æ™‚發生錯誤",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>è¦å‘Š</b>ï¼šæœªå®‰è£ \"smbclient\" ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ CIFS/SMB 分享，請洽您的系統管ç†å“¡å°‡å…¶å®‰è£ã€‚",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>è¦å‘Š</b>：PHP 並未啓用 FTP 的支æ´ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ FTP 分享，請洽您的系統管ç†å“¡å°‡å…¶å®‰è£ä¸¦å•“用。",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>è¦å‘Š</b>：PHP 並未啓用 Curl 的支æ´ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ ownCloud/WebDAV 或 Google Drive 分享，請洽您的系統管ç†å“¡å°‡å…¶å®‰è£ä¸¦å•“用。",
-"External Storage" => "外部儲å˜",
+"Access granted" => "訪å•æ¬Šå·²è¢«å‡†è¨±",
+"Grant access" => "准許訪å•æ¬Š",
+"External Storage" => "外部儲å˜è£ç½®",
"Folder name" => "資料夾å稱",
-"External storage" => "外部儲å˜",
+"External storage" => "外部儲å˜è£ç½®",
"Configuration" => "è¨å®š",
"Options" => "é¸é …",
-"Applicable" => "å¯ç”¨çš„",
-"Add storage" => "å¢žåŠ å„²å˜å€",
+"Add storage" => "æ·»åŠ å„²å˜å€",
"None set" => "尚未è¨å®š",
"All Users" => "所有使用者",
"Groups" => "群組",
"Users" => "使用者",
"Delete" => "刪除",
-"Enable User External Storage" => "啓用使用者外部儲å˜",
-"Allow users to mount their own external storage" => "å…許使用者自行掛載他們的外部儲å˜",
-"SSL root certificates" => "SSL æ ¹æ†‘è‰",
"Import Root Certificate" => "åŒ¯å…¥æ ¹æ†‘è‰"
);
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 5fdf6de50c..c3af434ee2 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Password" => "কূটশবà§à¦¦",
-"Submit" => "জমা দিন",
+"Submit" => "জমা দাও",
"%s shared the folder %s with you" => "%s আপনার সাথে %s ফোলà§à¦¡à¦¾à¦°à¦Ÿà¦¿ à¦à¦¾à¦—াà¦à¦¾à¦—ি করেছেন",
"%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি à¦à¦¾à¦—াà¦à¦¾à¦—ি করেছেন",
"Download" => "ডাউনলোড",
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index ab81589b0e..b92d6d478c 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,9 +1,9 @@
<?php $TRANSLATIONS = array(
"Password" => "Passwort",
-"Submit" => "Bestätigen",
+"Submit" => "Absenden",
"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
-"Download" => "Herunterladen",
+"Download" => "Download",
"No preview available for" => "Es ist keine Vorschau verfügbar für",
"web services under your control" => "Web-Services unter Ihrer Kontrolle"
);
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 2ea5ba76ab..ff7be88af8 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,5 +1,5 @@
<?php $TRANSLATIONS = array(
-"Password" => "סיסמ×",
+"Password" => "ססמה",
"Submit" => "שליחה",
"%s shared the folder %s with you" => "%s שיתף עמך ×ת התיקייה %s",
"%s shared the file %s with you" => "%s שיתף עמך ×ת הקובץ %s",
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
deleted file mode 100644
index 560df54fc9..0000000000
--- a/apps/files_sharing/l10n/hi.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "पासवरà¥à¤¡"
-);
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
deleted file mode 100644
index b2dca866bb..0000000000
--- a/apps/files_sharing/l10n/hr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "Lozinka",
-"Submit" => "Pošalji",
-"Download" => "Preuzimanje",
-"web services under your control" => "web usluge pod vašom kontrolom"
-);
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
deleted file mode 100644
index 438e8a7433..0000000000
--- a/apps/files_sharing/l10n/hy.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Submit" => "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬",
-"Download" => "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
-);
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
deleted file mode 100644
index d229135a71..0000000000
--- a/apps/files_sharing/l10n/ia.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "Contrasigno",
-"Submit" => "Submitter",
-"Download" => "Discargar",
-"web services under your control" => "servicios web sub tu controlo"
-);
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 675fc372e1..f139b0a064 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,5 +1,5 @@
<?php $TRANSLATIONS = array(
-"Password" => "وشەی تێپەربو",
+"Password" => "تێپه‌ڕه‌وشه",
"Submit" => "ناردن",
"%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
"%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index 630866ab4c..8aba5806aa 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,6 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Passwuert",
-"Submit" => "Fortschécken",
-"Download" => "Download",
-"web services under your control" => "Web Servicer ënnert denger Kontroll"
+"Password" => "Passwuert"
);
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 96ab48cd2c..d21a3c14f4 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
-"Password" => "Slaptažodis",
-"Submit" => "IÅ¡saugoti",
-"Download" => "Atsisiųsti",
-"web services under your control" => "jūsų valdomos web paslaugos"
+"Size" => "Dydis",
+"Modified" => "Pakeista",
+"Delete all" => "IÅ¡trinti viskÄ…",
+"Delete" => "IÅ¡trinti"
);
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 88faeaf9f1..0b22486708 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -5,5 +5,5 @@
"%s shared the file %s with you" => "%s ar jums dalÄ«jÄs ar datni %s",
"Download" => "LejupielÄdÄ“t",
"No preview available for" => "Nav pieejams priekšskatījums priekš",
-"web services under your control" => "tÄ«mekļa servisi tavÄ varÄ"
+"web services under your control" => "jÅ«su vadÄ«bÄ esoÅ¡ie tÄ«mekļa servisi"
);
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
deleted file mode 100644
index 879524afce..0000000000
--- a/apps/files_sharing/l10n/ms_MY.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "Kata laluan",
-"Submit" => "Hantar",
-"Download" => "Muat turun",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda"
-);
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
deleted file mode 100644
index abd1ee394b..0000000000
--- a/apps/files_sharing/l10n/nn_NO.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "Passord",
-"Submit" => "Send",
-"Download" => "Last ned",
-"web services under your control" => "Vev tjenester under din kontroll"
-);
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
deleted file mode 100644
index 07bc26ecdd..0000000000
--- a/apps/files_sharing/l10n/oc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "Senhal",
-"Submit" => "Sosmetre",
-"Download" => "Avalcarga",
-"web services under your control" => "Services web jos ton contraròtle"
-);
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index ce4c28ddcb..4dde4bb5ad 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -5,5 +5,5 @@
"%s shared the file %s with you" => "%s compartilhou o arquivo %s com você",
"Download" => "Baixar",
"No preview available for" => "Nenhuma visualização disponÃvel para",
-"web services under your control" => "serviços web sob seu controle"
+"web services under your control" => "web services sob seu controle"
);
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 580f7b1990..1c69c60817 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,9 +1,9 @@
<?php $TRANSLATIONS = array(
-"Password" => "මුර පදය",
+"Password" => "මුරපදය",
"Submit" => "යොමු කරන්න",
"%s shared the folder %s with you" => "%s ඔබව %s à·†à·à¶½à·Šà¶©à¶»à¶ºà¶§ හවුල් කරගà¶à·Šà¶à·šà¶º",
"%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදà·à·„දà·à¶œà¶à·Šà¶à·šà¶º",
-"Download" => "බà·à¶±à·Šà¶±",
+"Download" => "භà·à¶œà¶ කරන්න",
"No preview available for" => "පූර්වදර්à·à¶±à¶ºà¶šà·Š නොමà·à¶",
"web services under your control" => "ඔබට පà·à¶½à¶±à¶º කළ à·„à·à¶šà·’ වෙබ් සේවà·à·€à¶±à·Š"
);
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 14124eeb87..2e781f76f3 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -3,7 +3,7 @@
"Submit" => "Odoslať",
"%s shared the folder %s with you" => "%s zdieľa s vami prieÄinok %s",
"%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
-"Download" => "SÅ¥ahovanie",
+"Download" => "Stiahnuť",
"No preview available for" => "Žiaden náhľad k dispozÃcii pre",
"web services under your control" => "webové služby pod Vašou kontrolou"
);
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index be24c06e46..6e277f6771 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Password" => "Лозинка",
"Submit" => "Пошаљи",
-"Download" => "Преузми",
-"web services under your control" => "веб ÑервиÑи под контролом"
+"Download" => "Преузми"
);
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
deleted file mode 100644
index cce6bd1f77..0000000000
--- a/apps/files_sharing/l10n/sr@latin.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Password" => "Lozinka",
-"Submit" => "Pošalji",
-"Download" => "Preuzmi"
-);
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 42dfec8cc6..f2e6e5697d 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,5 +1,5 @@
<?php $TRANSLATIONS = array(
-"Password" => "Parola",
+"Password" => "Åžifre",
"Submit" => "Gönder",
"%s shared the folder %s with you" => "%s sizinle paylaşılan %s klasör",
"%s shared the file %s with you" => "%s sizinle paylaşılan %s klasör",
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 8e1fa4bc98..cdc103ad46 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Password" => "Пароль",
-"Submit" => "Передати",
+"Submit" => "Submit",
"%s shared the folder %s with you" => "%s опублікував каталог %s Ð´Ð»Ñ Ð’Ð°Ñ",
"%s shared the file %s with you" => "%s опублікував файл %s Ð´Ð»Ñ Ð’Ð°Ñ",
"Download" => "Завантажити",
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 14e4466ecb..f1d28731a7 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,9 +1,9 @@
<?php $TRANSLATIONS = array(
"Password" => "密碼",
"Submit" => "é€å‡º",
-"%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
-"%s shared the file %s with you" => "%s 和您分享了檔案 %s",
+"%s shared the folder %s with you" => "%s 分享了資料夾 %s 給您",
+"%s shared the file %s with you" => "%s 分享了檔案 %s 給您",
"Download" => "下載",
"No preview available for" => "無法é 覽",
-"web services under your control" => "由您控制的網路æœå‹™"
+"web services under your control" => "在您掌控之下的網路æœå‹™"
);
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 733b783876..9fccd0b46f 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -44,7 +44,7 @@ class Shared_Cache extends Cache {
$source = \OC_Share_Backend_File::getSource($target);
if (isset($source['path']) && isset($source['fileOwner'])) {
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
- $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
+ $mount = \OC\Files\Mount::findByNumericId($source['storage']);
if ($mount) {
$fullPath = $mount->getMountPoint().$source['path'];
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 2facad0f7e..ffd4e5ced2 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -71,7 +71,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($source) {
if (!isset($source['fullPath'])) {
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
- $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
+ $mount = \OC\Files\Mount::findByNumericId($source['storage']);
if ($mount) {
$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
} else {
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 62a63d515a..e06c66784f 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -2,13 +2,13 @@
"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
"Couldn't restore %s" => "Tidak dapat memulihkan %s",
"perform restore operation" => "jalankan operasi pemulihan",
-"Error" => "Galat",
+"Error" => "kesalahan",
"delete file permanently" => "hapus berkas secara permanen",
-"Delete permanently" => "Hapus secara permanen",
+"Delete permanently" => "hapus secara permanen",
"Name" => "Nama",
"Deleted" => "Dihapus",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} folder",
+"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!",
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 8166a024e5..14345ddcc4 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,10 +1,5 @@
<?php $TRANSLATIONS = array(
"Error" => "Feil",
-"Delete permanently" => "Slett for godt",
"Name" => "Namn",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
"Delete" => "Slett"
);
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 5c9f558f11..7fd1ab21ec 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -8,9 +8,9 @@
"Name" => "Nazwa",
"Deleted" => "Usunięte",
"1 folder" => "1 folder",
-"{count} folders" => "Ilość folderów: {count}",
+"{count} folders" => "{count} foldery",
"1 file" => "1 plik",
-"{count} files" => "Ilość plików: {count}",
+"{count} files" => "{count} pliki",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Restore" => "Przywróć",
"Delete" => "Usuń",
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index ba85158b70..7dfe610466 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -13,6 +13,6 @@
"{count} files" => "{count} ficheiros",
"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
"Restore" => "Restaurar",
-"Delete" => "Eliminar",
+"Delete" => "Apagar",
"Deleted Files" => "Ficheiros Apagados"
);
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 3af21b7e3f..c03ef600f3 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Error" => "Eroare",
-"Delete permanently" => "Stergere permanenta",
"Name" => "Nume",
"1 folder" => "1 folder",
"{count} folders" => "{count} foldare",
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 7cef36ef1c..7203f4c75f 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -5,7 +5,7 @@
"Error" => "Chyba",
"delete file permanently" => "trvalo zmazať súbor",
"Delete permanently" => "Zmazať trvalo",
-"Name" => "Názov",
+"Name" => "Meno",
"Deleted" => "Zmazané",
"1 folder" => "1 prieÄinok",
"{count} folders" => "{count} prieÄinkov",
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 88c71a75ab..f0b56eef01 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -39,15 +39,14 @@ class Trashbin {
$view = new \OC\Files\View('/'. $user);
if (!$view->is_dir('files_trashbin')) {
$view->mkdir('files_trashbin');
- $view->mkdir('files_trashbin/files');
- $view->mkdir('files_trashbin/versions');
- $view->mkdir('files_trashbin/keyfiles');
- $view->mkdir('files_trashbin/share-keys');
+ $view->mkdir("files_trashbin/files");
+ $view->mkdir("files_trashbin/versions");
+ $view->mkdir("files_trashbin/keyfiles");
}
$path_parts = pathinfo($file_path);
- $filename = $path_parts['basename'];
+ $deleted = $path_parts['basename'];
$location = $path_parts['dirname'];
$timestamp = time();
$mime = $view->getMimeType('files'.$file_path);
@@ -63,24 +62,45 @@ class Trashbin {
$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
}
- $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
-
- if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
+ $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
+
+ if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
$trashbinSize += $sizeOfAddedFiles;
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
- $result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user));
+ $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/files/'.$filename.'.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;
}
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash',
array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
- 'trashPath' => \OC\Files\Filesystem::normalizePath($filename.'.d'.$timestamp)));
-
- $trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
- $trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
-
+ 'trashPath' => \OC\Files\Filesystem::normalizePath($deleted.'.d'.$timestamp)));
+
+ // Take care of file versions
+ if ( \OCP\App::isEnabled('files_versions') ) {
+ if ( $view->is_dir('files_versions/'.$file_path) ) {
+ $trashbinSize += self::calculateSize(new \OC\Files\View('/'. $user.'/files_versions/'.$file_path));
+ $view->rename('files_versions/'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp);
+ } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($user, $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'], 'files_trashbin/versions/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
+ }
+ }
+ }
+
+ // Take care of encryption keys
+ $keyfile = \OC\Files\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\Files\View('/'.$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);
+ }
+ }
} else {
\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
}
@@ -91,134 +111,15 @@ class Trashbin {
}
- /**
- * Move file versions to trash so that they can be restored later
- *
- * @param \OC\Files\View $view
- * @param $file_path path to original file
- * @param $filename of deleted file
- * @param $timestamp when the file was deleted
- *
- * @return size of stored versions
- */
- private static function retainVersions($view, $file_path, $filename, $timestamp) {
- $size = 0;
- if (\OCP\App::isEnabled('files_versions')) {
-
- // disable proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $user = \OCP\User::getUser();
- if ($view->is_dir('files_versions/' . $file_path)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path));
- $view->rename('files_versions/' . $file_path, 'files_trashbin/versions/' . $filename . '.d' . $timestamp);
- } else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) {
- foreach ($versions as $v) {
- $size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']);
- $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
- }
- }
-
- // enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
- }
-
- return $size;
- }
-
- /**
- * Move encryption keys to trash so that they can be restored later
- *
- * @param \OC\Files\View $view
- * @param $file_path path to original file
- * @param $filename of deleted file
- * @param $timestamp when the file was deleted
- *
- * @return size of encryption keys
- */
- private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
- $size = 0;
-
- if (\OCP\App::isEnabled('files_encryption')) {
-
- $user = \OCP\User::getUser();
-
- // disable proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- // retain key files
- $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path);
-
- if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) {
- $user = \OCP\User::getUser();
- // move keyfiles
- if ($view->is_dir($keyfile)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
- $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
- } else {
- $size += $view->filesize($keyfile . '.key');
- $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
- }
- }
-
- // retain share keys
- $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path);
-
- if ($view->is_dir($sharekeys)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
- $view->rename($sharekeys, 'files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
- } else {
- // get local path to share-keys
- $localShareKeysPath = $view->getLocalFile($sharekeys);
-
- // handle share-keys
- $matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
- foreach ($matches as $src) {
- // get source file parts
- $pathinfo = pathinfo($src);
-
- // we only want to keep the owners key so we can access the private key
- $ownerShareKey = $filename . '.' . $user. '.shareKey';
-
- // if we found the share-key for the owner, we need to move it to files_trashbin
- if($pathinfo['basename'] == $ownerShareKey) {
-
- // calculate size
- $size += $view->filesize($sharekeys. '.' . $user. '.shareKey');
-
- // move file
- $view->rename($sharekeys. '.' . $user. '.shareKey', 'files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
- } else {
-
- // calculate size
- $size += filesize($src);
-
- // don't keep other share-keys
- unlink($src);
- }
- }
-
- }
-
- // enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
- }
- return $size;
- }
/**
* 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
- *
- * @return bool
- */
+ */
public static function restore($file, $filename, $timestamp) {
-
- $user = \OCP\User::getUser();
+ $user = \OCP\User::getUser();
$view = new \OC\Files\View('/'.$user);
$trashbinSize = self::getTrashbinSize($user);
@@ -256,17 +157,8 @@ class Trashbin {
// we need a extension in case a file/dir with the same name already exists
$ext = self::getUniqueExtension($location, $filename, $view);
$mtime = $view->filemtime($source);
-
- // disable proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- // restore file
- $restoreResult = $view->rename($source, $target.$ext);
-
- // handle the restore result
- if( $restoreResult ) {
- $view->touch($target.$ext, $mtime);
+ if( $view->rename($source, $target.$ext) ) {
+ $view->touch($target.$ext, $mtime);
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore',
array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
@@ -275,183 +167,68 @@ class Trashbin {
} else {
$trashbinSize -= $view->filesize($target.$ext);
}
-
- $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
- $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
-
+ // if versioning app is enabled, copy versions from the trash bin back to the original location
+ if ( \OCP\App::isEnabled('files_versions') ) {
+ if ($timestamp ) {
+ $versionedFile = $filename;
+ } else {
+ $versionedFile = $file;
+ }
+ if ( $result[0]['type'] === 'dir' ) {
+ $trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.'files_trashbin/versions/'. $file));
+ $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC\Files\Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext));
+ } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) {
+ foreach ($versions as $v) {
+ if ($timestamp ) {
+ $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('files_trashbin/versions/'.$versionedFile.'.v'.$v);
+ $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
+ }
+ }
+ }
+ }
+
+ // 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\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename);
+ } else {
+ $keyfile = \OC\Files\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\Files\View('/'.$user.'/'.$keyfile));
+ $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename);
+ } 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));
}
self::setTrashbinSize($user, $trashbinSize);
-
- // enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
-
+
return true;
+ } else {
+ \OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR);
}
- // enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
-
return false;
}
- /**
- * @brief restore versions from trash bin
- *
- * @param \OC\Files\View $view file view
- * @param $file complete path to file
- * @param $filename name of file
- * @param $ext file extension in case a file with the same $filename already exists
- * @param $location location if file
- * @param $timestamp deleteion time
- *
- * @return size of restored versions
- */
- private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
- $size = 0;
- if (\OCP\App::isEnabled('files_versions')) {
- // disable proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $user = \OCP\User::getUser();
- if ($timestamp) {
- $versionedFile = $filename;
- } else {
- $versionedFile = $file;
- }
-
- if ($view->is_dir('/files_trashbin/versions/'.$file)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
- $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext));
- } else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
- foreach ($versions as $v) {
- if ($timestamp) {
- $size += $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 {
- $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
- $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v);
- }
- }
- }
-
- // enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
- }
- return $size;
- }
-
-
- /**
- * @brief restore encryption keys from trash bin
- *
- * @param \OC\Files\View $view
- * @param $file complete path to file
- * @param $filename name of file
- * @param $ext file extension in case a file with the same $filename already exists
- * @param $location location if file
- * @param $timestamp deleteion time
- *
- * @return size of restored encrypted file
- */
- private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
- // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
- $size = 0;
- if (\OCP\App::isEnabled('files_encryption')) {
- $user = \OCP\User::getUser();
-
- $path_parts = pathinfo($file);
- $source_location = $path_parts['dirname'];
-
- if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
- if($source_location != '.') {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename);
- $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename);
- } else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
- $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
- }
- } else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
- }
-
- if ($timestamp) {
- $keyfile .= '.d' . $timestamp;
- }
-
- // disable proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- if ($view->file_exists($keyfile)) {
- // handle directory
- if ($view->is_dir($keyfile)) {
-
- // handle keyfiles
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
- $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext);
-
- // handle share-keys
- if ($timestamp) {
- $sharekey .= '.d' . $timestamp;
- }
- $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext);
-
- } else {
- // handle keyfiles
- $size += $view->filesize($keyfile);
- $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext . '.key');
-
- // handle share-keys
- $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
- if ($timestamp) {
- $ownerShareKey .= '.d' . $timestamp;
- }
-
- $size += $view->filesize($ownerShareKey);
-
- // move only owners key
- $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext . '.' . $user. '.shareKey');
-
- // try to re-share if file is shared
- $filesystemView = new \OC_FilesystemView('/');
- $session = new \OCA\Encryption\Session($filesystemView);
- $util = new \OCA\Encryption\Util($filesystemView, $user);
-
- // fix the file size
- $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $user . '/files/'. $location. '/' .$filename);
- $util->fixFileSize($absolutePath);
-
- // get current sharing state
- $sharingEnabled = \OCP\Share::isEnabled();
-
- // get the final filename
- $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename);
-
- // get users sharing this file
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user);
-
- // Attempt to set shareKey
- $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext);
- }
- }
-
- // enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
- }
- return $size;
- }
-
/**
- * @brief delete file from trash bin permanently
- *
+ * delete file from trash bin permanently
* @param $filename path to the file
* @param $timestamp of deletion time
- *
* @return size of deleted files
*/
public static function delete($filename, $timestamp=null) {
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index c8d2f7cfac..930cfbc33a 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -7,5 +7,5 @@
"No old versions available" => "Vanu versioone pole saadaval",
"No path specified" => "Asukohta pole määratud",
"Versions" => "Versioonid",
-"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
+"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides \"Revert\" nupule"
);
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index ad2e261d53..9eb4df6485 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Versions" => "גרס×ות"
+"History" => "היסטוריה",
+"Files Versioning" => "שמירת הבדלי גרס×ות של קבצי×",
+"Enable" => "הפעלה"
);
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index 9132caf75e..db5dbad49f 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Versions" => "وه‌شان"
+"History" => "مێژوو",
+"Files Versioning" => "وه‌شانی په‌ڕگه",
+"Enable" => "چالاککردن"
);
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index df59dfe4c8..18c7250610 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Versions" => "Versjoner"
+"History" => "Historie",
+"Files Versioning" => "Fil versjonering",
+"Enable" => "Aktiver"
);
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index cd9fc89dcc..7dfaee3672 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,11 +1,5 @@
<?php $TRANSLATIONS = array(
-"Could not revert: %s" => "Nu a putut reveni: %s",
-"success" => "success",
-"File %s was reverted to version %s" => "Fisierul %s a revenit la versiunea %s",
-"failure" => "eșec",
-"File %s could not be reverted to version %s" => "Fisierele %s nu au putut reveni la versiunea %s",
-"No old versions available" => "Versiunile vechi nu sunt disponibile",
-"No path specified" => "Nici un dosar specificat",
-"Versions" => "Versiuni",
-"Revert a file to a previous version by clicking on its revert button" => "Readuceti un fișier la o versiune anterioară, făcând clic pe butonul revenire"
+"History" => "Istoric",
+"Files Versioning" => "Versionare fișiere",
+"Enable" => "Activare"
);
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index c7ee63d8ef..37debf869b 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Versions" => "අනුවà·à¶¯"
+"History" => "ඉà¶à·’à·„à·à·ƒà¶º",
+"Files Versioning" => "ගොනු අනුවà·à¶¯à¶ºà¶±à·Š",
+"Enable" => "සක්â€à¶»à·’ය කරන්න"
);
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index 61a47e42f0..aca76dcc26 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Versions" => "பதிபà¯à®ªà¯à®•à®³à¯"
+"History" => "வரலாறà¯",
+"Files Versioning" => "கோபà¯à®ªà¯ பதிபà¯à®ªà¯à®•à®³à¯",
+"Enable" => "இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index 2998f74838..e1e996903a 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Versions" => "รุ่น"
+"History" => "ประวัติ",
+"Files Versioning" => "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”เวà¸à¸£à¹Œà¸Šà¸±à¹ˆà¸™à¸‚à¸à¸‡à¹„ฟล์",
+"Enable" => "เปิดใช้งาน"
);
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 33b045f2e3..f2499e7bf3 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -6,6 +6,5 @@
"File %s could not be reverted to version %s" => "File %s không thể khôi phục vỠphiên bản %s",
"No old versions available" => "Không có phiên bản cũ nà o",
"No path specified" => "Không chỉ ra Ä‘Æ°á»ng dẫn rõ rà ng",
-"Versions" => "Phiên bản",
"Revert a file to a previous version by clicking on its revert button" => "Khôi phục một file vỠphiên bản trước đó bằng cách click và o nút Khôi phục tương ứng"
);
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 8f2799b6e6..abdecb164e 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -15,7 +15,7 @@
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AvÃs:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà . Demaneu a l'administrador del sistema que l'instal·li.",
"Server configuration" => "Configuració del servidor",
"Add Server Configuration" => "Afegeix la configuració del servidor",
-"Host" => "Equip remot",
+"Host" => "MÃ quina",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
"Base DN" => "DN Base",
"One Base DN per line" => "Una DN Base per lÃnia",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 89fc40af4f..9a01a67703 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -10,7 +10,7 @@
"Server configuration" => "پیکربندی سرور",
"Add Server Configuration" => "اÙزودن پیکربندی سرور",
"Host" => "میزبانی",
-"Password" => "گذرواژه",
+"Password" => "رمز عبور",
"Group Filter" => "Ùیلتر گروه",
"Port" => "درگاه",
"in bytes" => "در بایت",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 215d518e7a..deb6dbb555 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -3,7 +3,7 @@
"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" => "Produciuse un fallo ao eliminar",
+"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",
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 45166eb0e3..60d4ea98e8 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "पासवरà¥à¤¡",
"Help" => "सहयोग"
);
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index 005a76d4bb..9150331506 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 38374abda7..3586bf5a2e 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Contrasigno",
"Help" => "Adjuta"
);
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 5f76d6b99f..1f6d8fcffe 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -3,7 +3,7 @@
"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",
+"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",
@@ -15,14 +15,14 @@
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> 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",
+"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" => "Sandi",
+"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.",
@@ -71,5 +71,5 @@
"User Home Folder Naming Rule" => "Aturan Penamaan Folder Home Pengguna",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Test Configuration" => "Uji Konfigurasi",
-"Help" => "Bantuan"
+"Help" => "bantuan"
);
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index f8f893834b..1ae808ddd9 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "وشەی تێپەربو",
"Help" => "یارمەتی"
);
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 88ed18346c..17a6cbe2cb 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,5 +1,4 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Pemadaman gagal",
-"Password" => "Kata laluan",
"Help" => "Bantuan"
);
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 1adac1b102..54d1f158f6 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Passord",
"Help" => "Hjelp"
);
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 49b6c5970c..a128638172 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,5 +1,4 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Fracàs d'escafatge",
-"Password" => "Senhal",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index a5b620e48b..776aa445e4 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -3,7 +3,7 @@
"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownCloud ",
-"Deletion failed" => "Usunięcie nie powiodło się",
+"Deletion failed" => "Skasowanie nie powiodło się",
"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
"Keep settings?" => "Zachować ustawienia?",
"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 02b03d5a75..3092d06143 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -22,7 +22,7 @@
"You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
"User DN" => "DN do utilizador",
"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 to cliente ",
-"Password" => "Password",
+"Password" => "Palavra-passe",
"For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
"User Login Filter" => "Filtro de login de utilizador",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado.",
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index 005a76d4bb..9150331506 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index e6d450301e..7bcabb0448 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,49 +1,28 @@
<?php $TRANSLATIONS = array(
-"The configuration is valid and the connection could be established!" => "Uyunlama mantikli ve baglama yerlestirmek edebilmi.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. ",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. ",
"Deletion failed" => "Silme başarısız oldu",
-"Take over settings from recent server configuration?" => "Parametri sonadan uyunlama cikarmak mi?",
"Keep settings?" => "Ayarları kalsınmı?",
-"Cannot add server configuration" => "Sunucu uyunlama birlemek edemen. ",
"Connection test succeeded" => "Bağlantı testi başarılı oldu",
"Connection test failed" => "Bağlantı testi başarısız oldu",
-"Do you really want to delete the current Server Configuration?" => "Hakikatten, Sonuncu Funksyon durmak istiyor mi?",
"Confirm Deletion" => "Silmeyi onayla",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin.",
"Host" => "Sunucu",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. ",
"Base DN" => "Ana DN",
-"One Base DN per line" => "Bir Tabani DN herbir dizi. ",
-"You can specify Base DN for users and groups in the Advanced tab" => "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. ",
"User DN" => "Kullanıcı 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 musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. ",
"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 Filtresi",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. ",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"",
"User List Filter" => "Kullanıcı Liste Filtresi",
-"Defines the filter to apply, when retrieving users." => "Filter uyunmak icin tayin ediyor, ne zaman adi kullanici geri aliyor. ",
"without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"",
"Group Filter" => "Grup Süzgeci",
-"Defines the filter to apply, when retrieving groups." => "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. ",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. ",
"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.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. ",
"Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
"in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
-"User Display Name Field" => "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)",
"Base User Tree" => "Temel Kullanıcı Ağacı",
-"Group Display Name Field" => "Grub Ekrane Alani Adi",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP kullamayin grub adi ownCloud uremek icin. ",
"Base Group Tree" => "Temel Grup Ağacı",
-"One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ",
"Group-Member association" => "Grup-Ãœye iÅŸbirliÄŸi",
"in bytes" => "byte cinsinden",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
diff --git a/core/css/styles.css b/core/css/styles.css
index 93f2cecbfe..4dfa3f64a3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -220,8 +220,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
}
#login #databaseField .infield { padding-left:0; }
#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
-#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
-#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
/* Show password toggle */
#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
@@ -344,8 +342,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
.center { text-align:center; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
-#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
-#notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
+#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index e1737643b4..0f4678327a 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -35,8 +35,7 @@
'style' : $element.attr('style'),
'size' : $element.attr('size'),
'name' : $element.attr('name')+'-clone',
- 'tabindex' : $element.attr('tabindex'),
- 'autocomplete' : 'off'
+ 'tabindex' : $element.attr('tabindex')
});
return $clone;
@@ -103,16 +102,7 @@
$clone.bind('blur', function() { $input.trigger('focusout'); });
setState( $checkbox, $input, $clone );
-
- // set type of password field clone (type=text) to password right on submit
- // to prevent browser save the value of this field
- $clone.closest('form').submit(function(e) {
- // .prop has to be used, because .attr throws
- // an error while changing a type of an input
- // element
- $clone.prop('type', 'password');
- });
-
+
if( callback.fn ){
callback.fn( callback.args );
}
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 587e59695c..4d413715de 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -30,7 +30,7 @@
"October" => "تشرين الاول",
"November" => "تشرين الثاني",
"December" => "كانون الاول",
-"Settings" => "إعدادات",
+"Settings" => "تعديلات",
"seconds ago" => "منذ ثواني",
"1 minute ago" => "منذ دقيقة",
"{minutes} minutes ago" => "{minutes} منذ دقائق",
@@ -63,7 +63,7 @@
"Share with" => "شارك مع",
"Share with link" => "شارك مع رابط",
"Password protect" => "Øماية كلمة السر",
-"Password" => "كلمة المرور",
+"Password" => "كلمة السر",
"Email link to person" => "ارسل الرابط بالبريد الى صديق",
"Send" => "أرسل",
"Set expiration date" => "تعيين تاريخ إنتهاء الصلاØية",
@@ -89,21 +89,23 @@
"ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
"You will receive a link to reset your password via Email." => "سو٠نرسل لك بريد ÙŠØتوي على وصلة لتجديد كلمة السر.",
+"Reset email send." => "إعادة إرسال البريد الإلكتروني.",
+"Request failed!" => "Ùشل الطلب",
"Username" => "إسم المستخدم",
"Request reset" => "طلب تعديل",
"Your password was reset" => "لقد تم تعديل كلمة السر",
"To login page" => "الى صÙØØ© الدخول",
-"New password" => "كلمات سر جديدة",
+"New password" => "كلمة سر جديدة",
"Reset password" => "تعديل كلمة السر",
-"Personal" => "شخصي",
-"Users" => "المستخدمين",
+"Personal" => "خصوصيات",
+"Users" => "المستخدم",
"Apps" => "التطبيقات",
-"Admin" => "المدير",
+"Admin" => "مستخدم رئيسي",
"Help" => "المساعدة",
"Access forbidden" => "التوصّل Ù…Øظور",
"Cloud not found" => "لم يتم إيجاد",
"Edit categories" => "عدل الÙئات",
-"Add" => "اضÙ",
+"Add" => "أدخل",
"Security Warning" => "تØذير أمان",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Please update your PHP installation to use ownCloud securely.",
@@ -112,7 +114,7 @@
"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 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "للØصول على معلومات عن كيÙية اعداد الخادم الخاص بك , يرجى زيارة الرابط التالي <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
"Create an <strong>admin account</strong>" => "أض٠</strong>مستخدم رئيسي <strong>",
-"Advanced" => "تعديلات متقدمه",
+"Advanced" => "خيارات متقدمة",
"Data folder" => "مجلد المعلومات",
"Configure the database" => "أسس قاعدة البيانات",
"will be used" => "سيتم استخدمه",
@@ -122,7 +124,7 @@
"Database tablespace" => "مساØØ© جدول قاعدة البيانات",
"Database host" => "خادم قاعدة البيانات",
"Finish setup" => "انهاء التعديلات",
-"web services under your control" => "خدمات الشبكة تØت سيطرتك",
+"web services under your control" => "خدمات الوب تØت تصرÙÙƒ",
"Log out" => "الخروج",
"Automatic logon rejected!" => "تم رÙض تسجيل الدخول التلقائي!",
"If you did not change your password recently, your account may be compromised!" => "قد يكون Øسابك ÙÙŠ خطر إن لم تقم بإعادة تعيين كلمة السر Øديثاً",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 74e28bf290..dadb570d93 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,24 +1,4 @@
<?php $TRANSLATIONS = array(
-"No categories selected for deletion." => "ÐÑма избрани категории за изтриване",
-"Sunday" => "ÐеделÑ",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "СрÑда",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"January" => "Януари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Ðприл",
-"May" => "Май",
-"June" => "Юни",
-"July" => "Юли",
-"August" => "ÐвгуÑÑ‚",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ðоември",
-"December" => "Декември",
"Settings" => "ÐаÑтройки",
"seconds ago" => "преди Ñекунди",
"1 minute ago" => "преди 1 минута",
@@ -28,45 +8,16 @@
"last month" => "поÑледниÑÑ‚ меÑец",
"last year" => "поÑледната година",
"years ago" => "поÑледните години",
-"Ok" => "Добре",
"Cancel" => "Отказ",
-"Yes" => "Да",
-"No" => "Ðе",
"Error" => "Грешка",
"Share" => "СподелÑне",
-"Share with" => "Споделено Ñ",
"Password" => "Парола",
-"create" => "Ñъздаване",
-"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
-"Username" => "Потребител",
-"Request reset" => "Ðулиране на заÑвка",
-"Your password was reset" => "Вашата парола е нулирана",
"New password" => "Ðова парола",
-"Reset password" => "Ðулиране на парола",
"Personal" => "Лични",
"Users" => "Потребители",
"Apps" => "ПриложениÑ",
"Admin" => "Ðдмин",
"Help" => "Помощ",
-"Access forbidden" => "ДоÑтъпът е забранен",
-"Cloud not found" => "облакът не намерен",
-"Edit categories" => "Редактиране на категориите",
"Add" => "ДобавÑне",
-"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
-"Advanced" => "Разширено",
-"Data folder" => "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° данни",
-"Configure the database" => "Конфигуриране на базата",
-"will be used" => "ще Ñе ползва",
-"Database user" => "Потребител за базата",
-"Database password" => "Парола за базата",
-"Database name" => "Име на базата",
-"Database host" => "ХоÑÑ‚ за базата",
-"Finish setup" => "Завършване на наÑтройките",
-"web services under your control" => "уеб уÑлуги под Ваш контрол",
-"Log out" => "Изход",
-"Lost your password?" => "Забравена парола?",
-"remember" => "запомни",
-"Log in" => "Вход",
-"prev" => "пред.",
-"next" => "Ñледващо"
+"web services under your control" => "уеб уÑлуги под Ваш контрол"
);
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 63a80edad3..1b18b6ae3e 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -8,13 +8,13 @@
"Object type not provided." => "অবজেকà§à¦Ÿà§‡à¦° ধরণটি পà§à¦°à¦¦à¦¾à¦¨ করা হয় নি।",
"%s ID not provided." => "%s ID পà§à¦°à¦¦à¦¾à¦¨ করা হয় নি।",
"Error adding %s to favorites." => "পà§à¦°à¦¿à§Ÿà¦¤à§‡ %s যোগ করতে সমসà§à¦¯à¦¾ দেখা দিয়েছে।",
-"No categories selected for deletion." => "মà§à¦›à§‡ ফেলার জনà§à¦¯ কনো কà§à¦¯à¦¾à¦Ÿà§‡à¦—রি নিরà§à¦¬à¦¾à¦šà¦¨ করা হয় নি।",
+"No categories selected for deletion." => "মà§à¦›à§‡ ফেলার জনà§à¦¯ কোন কà§à¦¯à¦¾à¦Ÿà§‡à¦—রি নিরà§à¦¬à¦¾à¦šà¦¨ করা হয় নি ।",
"Error removing %s from favorites." => "পà§à¦°à¦¿à§Ÿ থেকে %s সরিয়ে ফেলতে সমসà§à¦¯à¦¾ দেখা দিয়েছে।",
"Sunday" => "রবিবার",
"Monday" => "সোমবার",
"Tuesday" => "মঙà§à¦—লবার",
"Wednesday" => "বà§à¦§à¦¬à¦¾à¦°",
-"Thursday" => "বৃহসà§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°",
+"Thursday" => "বৃহষà§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°",
"Friday" => "শà§à¦•à§à¦°à¦¬à¦¾à¦°",
"Saturday" => "শনিবার",
"January" => "জানà§à§Ÿà¦¾à¦°à¦¿",
@@ -31,14 +31,14 @@
"December" => "ডিসেমà§à¦¬à¦°",
"Settings" => "নিয়ামকসমূহ",
"seconds ago" => "সেকেনà§à¦¡ পূরà§à¦¬à§‡",
-"1 minute ago" => "১ মিনিট পূরà§à¦¬à§‡",
+"1 minute ago" => "1 মিনিট পূরà§à¦¬à§‡",
"{minutes} minutes ago" => "{minutes} মিনিট পূরà§à¦¬à§‡",
"1 hour ago" => "1 ঘনà§à¦Ÿà¦¾ পূরà§à¦¬à§‡",
"{hours} hours ago" => "{hours} ঘনà§à¦Ÿà¦¾ পূরà§à¦¬à§‡",
"today" => "আজ",
"yesterday" => "গতকাল",
"{days} days ago" => "{days} দিন পূরà§à¦¬à§‡",
-"last month" => "গত মাস",
+"last month" => "গতমাস",
"{months} months ago" => "{months} মাস পূরà§à¦¬à§‡",
"months ago" => "মাস পূরà§à¦¬à§‡",
"last year" => "গত বছর",
@@ -71,7 +71,7 @@
"No people found" => "কোন বà§à¦¯à¦•à§à¦¤à¦¿ খà§à¦à¦œà§‡ পাওয়া গেল না",
"Resharing is not allowed" => "পূনঃরায় à¦à¦¾à¦—াà¦à¦¾à¦—ি অনà§à¦®à§‹à¦¦à¦¿à¦¤ নয়",
"Shared in {item} with {user}" => "{user} à¦à¦° সাথে {item} à¦à¦¾à¦—াà¦à¦¾à¦—ি করা হয়েছে",
-"Unshare" => "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল ",
+"Unshare" => "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল কর",
"can edit" => "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ করতে পারবেন",
"access control" => "অধিগমà§à¦¯à¦¤à¦¾ নিয়নà§à¦¤à§à¦°à¦£",
"create" => "তৈরী করà§à¦¨",
@@ -86,6 +86,8 @@
"ownCloud password reset" => "ownCloud কূটশবà§à¦¦ পূনঃনিরà§à¦§à¦¾à¦°à¦£",
"Use the following link to reset your password: {link}" => "আপনার কূটশবà§à¦¦à¦Ÿà¦¿ পূনঃনিরà§à¦§à¦¾à¦°à¦£ করার জনà§à¦¯ নিমà§à¦¨à§‹à¦•à§à¦¤ লিংকটি বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨à¦ƒ {link}",
"You will receive a link to reset your password via Email." => "কূটশবà§à¦¦ পূনঃনিরà§à¦§à¦¾à¦°à¦£à§‡à¦° জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ টূনঃনিরà§à¦§à¦¾à¦°à¦£ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
+"Reset email send." => "পূনঃনিরà§à¦§à¦¾à¦°à¦£ ই-মেইল পাঠানো হয়েছে।",
+"Request failed!" => "অনà§à¦°à§‹à¦§ বà§à¦¯à¦°à§à¦¥ !",
"Username" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
"Request reset" => "অনà§à¦°à§‹à¦§ পূনঃনিরà§à¦§à¦¾à¦°à¦£",
"Your password was reset" => "আপনার কূটশবà§à¦¦à¦Ÿà¦¿ পূনঃনিরà§à¦§à¦¾à¦°à¦£ করা হয়েছে",
@@ -94,7 +96,7 @@
"Reset password" => "কূটশবà§à¦¦ পূনঃনিরà§à¦§à¦¾à¦°à¦£ কর",
"Personal" => "বà§à¦¯à¦•à§à¦¤à¦¿à¦—ত",
"Users" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
-"Apps" => "অà§à¦¯à¦¾à¦ª",
+"Apps" => "অà§à¦¯à¦¾à¦ªà¦¸",
"Admin" => "পà§à¦°à¦¶à¦¾à¦¸à¦¨",
"Help" => "সহায়িকা",
"Access forbidden" => "অধিগমনের অনà§à¦®à¦¤à¦¿ নেই",
@@ -113,7 +115,7 @@
"Database tablespace" => "ডাটাবেজ টেবলসà§à¦ªà§‡à¦¸",
"Database host" => "ডাটাবেজ হোসà§à¦Ÿ",
"Finish setup" => "সেটআপ সà§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ কর",
-"web services under your control" => "ওয়েব সারà§à¦à¦¿à¦¸ আপনার হাতের মà§à¦ োয়",
+"web services under your control" => "ওয়েব সারà§à¦à¦¿à¦¸à§‡à¦° নিয়নà§à¦¤à§à¦°à¦£ আপনার হাতের মà§à¦ োয়",
"Log out" => "পà§à¦°à¦¸à§à¦¥à¦¾à¦¨",
"Lost your password?" => "কূটশবà§à¦¦ হারিয়েছেন?",
"remember" => "মনে রাখ",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 818c5b20b9..91b51d1b31 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -30,7 +30,7 @@
"October" => "Octubre",
"November" => "Novembre",
"December" => "Desembre",
-"Settings" => "Configuració",
+"Settings" => "Arranjament",
"seconds ago" => "segons enrere",
"1 minute ago" => "fa 1 minut",
"{minutes} minutes ago" => "fa {minutes} minuts",
@@ -89,6 +89,8 @@
"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
"You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
+"Reset email send." => "S'ha enviat el correu reinicialització",
+"Request failed!" => "El requeriment ha fallat!",
"Username" => "Nom d'usuari",
"Request reset" => "Sol·licita reinicialització",
"Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
@@ -98,7 +100,7 @@
"Personal" => "Personal",
"Users" => "Usuaris",
"Apps" => "Aplicacions",
-"Admin" => "Administració",
+"Admin" => "Administrador",
"Help" => "Ajuda",
"Access forbidden" => "Accés prohibit",
"Cloud not found" => "No s'ha trobat el núvol",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 47206be618..15c89106e5 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
"ownCloud password reset" => "Obnovenà hesla pro ownCloud",
"Use the following link to reset your password: {link}" => "Heslo obnovÃte použitÃm následujÃcÃho odkazu: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenà hesla byl odeslán na vaÅ¡i e-mailovou adresu.<br>Pokud jej v krátké dobÄ› neobdržÃte, zkontrolujte váš koÅ¡ a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
+"Reset email send." => "Obnovovacà e-mail odeslán.",
+"Request failed!" => "Požadavek selhal.",
"Username" => "Uživatelské jméno",
"Request reset" => "Vyžádat obnovu",
"Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -124,7 +124,7 @@
"Database tablespace" => "Tabulkový prostor databáze",
"Database host" => "Hostitel databáze",
"Finish setup" => "DokonÄit nastavenÃ",
-"web services under your control" => "služby webu pod Vašà kontrolou",
+"web services under your control" => "webové služby pod Vašà kontrolou",
"Log out" => "Odhlásit se",
"Automatic logon rejected!" => "Automatické pÅ™ihlášenà odmÃtnuto.",
"If you did not change your password recently, your account may be compromised!" => "V nedávné dobÄ› jste nezmÄ›nili své heslo, Váš úÄet může být kompromitován.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index d614797eb6..4d28ae29a9 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -89,6 +89,8 @@
"ownCloud password reset" => "ailosod cyfrinair ownCloud",
"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+"Reset email send." => "Ailosod anfon e-bost.",
+"Request failed!" => "Methodd y cais!",
"Username" => "Enw defnyddiwr",
"Request reset" => "Gwneud cais i ailosod",
"Your password was reset" => "Ailosodwyd eich cyfrinair",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 43b2f4f840..286f524b67 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -45,7 +45,7 @@
"last year" => "sidste år",
"years ago" => "Ã¥r siden",
"Ok" => "OK",
-"Cancel" => "Annuller",
+"Cancel" => "Fortryd",
"Choose" => "Vælg",
"Yes" => "Ja",
"No" => "Nej",
@@ -89,13 +89,15 @@
"ownCloud password reset" => "Nulstil ownCloud kodeord",
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
+"Reset email send." => "Reset-mail afsendt.",
+"Request failed!" => "Anmodningen mislykkedes!",
"Username" => "Brugernavn",
"Request reset" => "Anmod om nulstilling",
"Your password was reset" => "Dit kodeord blev nulstillet",
"To login page" => "Til login-side",
"New password" => "Nyt kodeord",
"Reset password" => "Nulstil kodeord",
-"Personal" => "Personligt",
+"Personal" => "Personlig",
"Users" => "Brugere",
"Apps" => "Apps",
"Admin" => "Admin",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c173e56c1f..3af653b9ac 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -88,9 +88,9 @@
"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}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist frage Deinen lokalen Administrator.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.",
+"Request failed!" => "Die Anfrage schlug fehl!",
"Username" => "Benutzername",
"Request reset" => "Beantrage Zurücksetzung",
"Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
@@ -99,8 +99,8 @@
"Reset password" => "Passwort zurücksetzen",
"Personal" => "Persönlich",
"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administration",
+"Apps" => "Anwendungen",
+"Admin" => "Admin",
"Help" => "Hilfe",
"Access forbidden" => "Zugriff verboten",
"Cloud not found" => "Cloud nicht gefunden",
@@ -124,7 +124,7 @@
"Database tablespace" => "Datenbank-Tablespace",
"Database host" => "Datenbank-Host",
"Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Deiner Kontrolle",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
"Log out" => "Abmelden",
"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b69868e5e5..4065f2484f 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -43,7 +43,7 @@
"{months} months ago" => "Vor {months} Monaten",
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
-"years ago" => "Vor Jahren",
+"years ago" => "Vor Jahren",
"Ok" => "OK",
"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
@@ -88,9 +88,9 @@
"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}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer sinnvollen Zeitspanne erhalten prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist fragen Sie Ihren lokalen Administrator.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+"Reset email send." => "Eine E-Mail zum Zurücksetzen des Passworts wurde gesendet.",
+"Request failed!" => "Die Anfrage schlug fehl!",
"Username" => "Benutzername",
"Request reset" => "Zurücksetzung beantragen",
"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
@@ -99,12 +99,12 @@
"Reset password" => "Passwort zurücksetzen",
"Personal" => "Persönlich",
"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administrator",
+"Apps" => "Anwendungen",
+"Admin" => "Admin",
"Help" => "Hilfe",
"Access forbidden" => "Zugriff verboten",
"Cloud not found" => "Cloud wurde nicht gefunden",
-"Edit categories" => "Kategorien ändern",
+"Edit categories" => "Kategorien bearbeiten",
"Add" => "Hinzufügen",
"Security Warning" => "Sicherheitshinweis",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index dbe0d0ee3d..4fc5b4aa86 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Η ενημÎÏωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
"ownCloud password reset" => "ΕπαναφοÏά ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ownCloud",
"Use the following link to reset your password: {link}" => "ΧÏησιμοποιήστε τον ακόλουθο σÏνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ο σÏνδεσμος για να επανακτήσετε τον κωδικό σας Îχει σταλεί στο email <br>αν δεν το λάβετε μÎσα σε οÏισμÎνο διάστημα, ελÎγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί Ïωτήστε τον τοπικό σας διαχειÏιστή ",
-"Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απÎτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
"You will receive a link to reset your password via Email." => "Θα λάβετε Îνα σÏνδεσμο για να επαναφÎÏετε τον κωδικό Ï€Ïόσβασής σας μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου.",
-"Username" => "Όνομα χÏήστη",
+"Reset email send." => "Η επαναφοÏά του email στάλθηκε.",
+"Request failed!" => "Η αίτηση απÎτυχε!",
+"Username" => "Όνομα ΧÏήστη",
"Request reset" => "ΕπαναφοÏά αίτησης",
"Your password was reset" => "Ο κωδικός Ï€Ïόσβασής σας επαναφÎÏθηκε",
"To login page" => "Σελίδα εισόδου",
@@ -124,7 +124,7 @@
"Database tablespace" => "Κενά Πινάκων Βάσης ΔεδομÎνων",
"Database host" => "Διακομιστής βάσης δεδομÎνων",
"Finish setup" => "ΟλοκλήÏωση εγκατάστασης",
-"web services under your control" => "υπηÏεσίες δικτÏου υπό τον Îλεγχό σας",
+"web services under your control" => "ΥπηÏεσίες web υπό τον Îλεγχό σας",
"Log out" => "ΑποσÏνδεση",
"Automatic logon rejected!" => "ΑποÏÏίφθηκε η αυτόματη σÏνδεση!",
"If you did not change your password recently, your account may be compromised!" => "Εάν δεν αλλάξατε το συνθηματικό σας Ï€Ïοσφάτως, ο λογαÏιασμός μποÏεί να Îχει διαÏÏεÏσει!",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 1889de1ea2..5c8fe34031 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -85,6 +85,7 @@
"ownCloud password reset" => "La pasvorto de ownCloud restariÄis.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoÅte por rekomencigi vian pasvorton.",
+"Request failed!" => "Peto malsukcesis!",
"Username" => "Uzantonomo",
"Request reset" => "Peti rekomencigon",
"Your password was reset" => "Via pasvorto rekomencis",
@@ -113,7 +114,7 @@
"Database tablespace" => "Datumbaza tabelospaco",
"Database host" => "Datumbaza gastigo",
"Finish setup" => "Fini la instalon",
-"web services under your control" => "TTT-servoj regataj de vi",
+"web services under your control" => "TTT-servoj sub via kontrolo",
"Log out" => "Elsaluti",
"If you did not change your password recently, your account may be compromised!" => "Se vi ne ÅanÄis vian pasvorton lastatempe, via konto eble kompromitas!",
"Please change your password to secure your account again." => "Bonvolu ÅanÄi vian pasvorton por sekurigi vian konton ree.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 8a3ab44e85..543563bed1 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -50,7 +50,7 @@
"Yes" => "SÃ",
"No" => "No",
"The object type is not specified." => "El tipo de objeto no se ha especificado.",
-"Error" => "Error",
+"Error" => "Fallo",
"The app name is not specified." => "El nombre de la app no se ha especificado.",
"The required file {file} is not installed!" => "El fichero {file} requerido, no está instalado.",
"Shared" => "Compartido",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora.",
"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su spam / carpetas no deseados. <br> Si no está allà pregunte a su administrador local.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Petición ha fallado! <br> ¿Usted asegúrese que su dirección de correo electrónico / nombre de usuario estaba justo?",
"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
+"Reset email send." => "Email de reconfiguración enviado.",
+"Request failed!" => "Pedido fallado!",
"Username" => "Nombre de usuario",
"Request reset" => "Solicitar restablecimiento",
"Your password was reset" => "Tu contraseña se ha restablecido",
@@ -100,12 +100,12 @@
"Personal" => "Personal",
"Users" => "Usuarios",
"Apps" => "Aplicaciones",
-"Admin" => "Administración",
+"Admin" => "Administrador",
"Help" => "Ayuda",
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "No se ha encontrado la nube",
"Edit categories" => "Editar categorÃas",
-"Add" => "Agregar",
+"Add" => "Añadir",
"Security Warning" => "Advertencia de seguridad",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud en forma segura.",
@@ -124,7 +124,7 @@
"Database tablespace" => "Espacio de tablas de la base de datos",
"Database host" => "Host de la base de datos",
"Finish setup" => "Completar la instalación",
-"web services under your control" => "Servicios web bajo su control",
+"web services under your control" => "servicios web bajo tu control",
"Log out" => "Salir",
"Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 8f77843708..748de3ddd1 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Tipo de objeto no provisto. ",
"%s ID not provided." => "%s ID no provista. ",
"Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
-"No categories selected for deletion." => "No se seleccionaron categorÃas para borrar.",
+"No categories selected for deletion." => "No hay categorÃas seleccionadas para borrar.",
"Error removing %s from favorites." => "Error al remover %s de favoritos. ",
"Sunday" => "Domingo",
"Monday" => "Lunes",
@@ -18,23 +18,23 @@
"Thursday" => "Jueves",
"Friday" => "Viernes",
"Saturday" => "Sábado",
-"January" => "enero",
-"February" => "febrero",
-"March" => "marzo",
-"April" => "abril",
-"May" => "mayo",
-"June" => "junio",
-"July" => "julio",
-"August" => "agosto",
-"September" => "septiembre",
-"October" => "octubre",
-"November" => "noviembre",
-"December" => "diciembre",
-"Settings" => "Configuración",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
+"Settings" => "Ajustes",
"seconds ago" => "segundos atrás",
"1 minute ago" => "hace 1 minuto",
"{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "1 hora atrás",
+"1 hour ago" => "Hace 1 hora",
"{hours} hours ago" => "{hours} horas atrás",
"today" => "hoy",
"yesterday" => "ayer",
@@ -72,7 +72,7 @@
"No people found" => "No se encontraron usuarios",
"Resharing is not allowed" => "No se permite volver a compartir",
"Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "Dejar de compartir",
+"Unshare" => "Remover compartir",
"can edit" => "puede editar",
"access control" => "control de acceso",
"create" => "crear",
@@ -89,16 +89,18 @@
"ownCloud password reset" => "Restablecer contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
+"Reset email send." => "Reiniciar envÃo de email.",
+"Request failed!" => "Error en el pedido!",
"Username" => "Nombre de usuario",
"Request reset" => "Solicitar restablecimiento",
"Your password was reset" => "Tu contraseña fue restablecida",
"To login page" => "A la página de inicio de sesión",
-"New password" => "Nueva contraseña:",
+"New password" => "Nueva contraseña",
"Reset password" => "Restablecer contraseña",
"Personal" => "Personal",
"Users" => "Usuarios",
"Apps" => "Aplicaciones",
-"Admin" => "Administración",
+"Admin" => "Administrador",
"Help" => "Ayuda",
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "No se encontró ownCloud",
@@ -122,7 +124,7 @@
"Database tablespace" => "Espacio de tablas de la base de datos",
"Database host" => "Host de la base de datos",
"Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web controlados por vos",
+"web services under your control" => "servicios web sobre los que tenés control",
"Log out" => "Cerrar la sesión",
"Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
"If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index aac3898fbb..b6b6d4c9d9 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -88,22 +88,23 @@
"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
"ownCloud password reset" => "ownCloud parooli taastamine",
"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-"Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
+"Reset email send." => "Taastamise e-kiri on saadetud.",
+"Request failed!" => "Päring ebaõnnestus!",
"Username" => "Kasutajanimi",
"Request reset" => "Päringu taastamine",
"Your password was reset" => "Sinu parool on taastatud",
"To login page" => "Sisselogimise lehele",
"New password" => "Uus parool",
"Reset password" => "Nulli parool",
-"Personal" => "Isiklik",
+"Personal" => "isiklik",
"Users" => "Kasutajad",
-"Apps" => "Rakendused",
+"Apps" => "Programmid",
"Admin" => "Admin",
"Help" => "Abiinfo",
"Access forbidden" => "Ligipääs on keelatud",
"Cloud not found" => "Pilve ei leitud",
-"Edit categories" => "Muuda kategooriat",
+"Edit categories" => "Muuda kategooriaid",
"Add" => "Lisa",
"Security Warning" => "Turvahoiatus",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
@@ -113,7 +114,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.",
"Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Advanced" => "Täpsem",
+"Advanced" => "Lisavalikud",
"Data folder" => "Andmete kaust",
"Configure the database" => "Seadista andmebaasi",
"will be used" => "kasutatakse",
@@ -123,7 +124,7 @@
"Database tablespace" => "Andmebaasi tabeliruum",
"Database host" => "Andmebaasi host",
"Finish setup" => "Lõpeta seadistamine",
-"web services under your control" => "veebitenused sinu kontrolli all",
+"web services under your control" => "veebiteenused sinu kontrolli all",
"Log out" => "Logi välja",
"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 9c9d28133c..76e38a92d1 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -89,6 +89,8 @@
"ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
"Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
"You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
+"Reset email send." => "Berrezartzeko eposta bidali da.",
+"Request failed!" => "Eskariak huts egin du!",
"Username" => "Erabiltzaile izena",
"Request reset" => "Eskaera berrezarri da",
"Your password was reset" => "Zure pasahitza berrezarri da",
@@ -98,7 +100,7 @@
"Personal" => "Pertsonala",
"Users" => "Erabiltzaileak",
"Apps" => "Aplikazioak",
-"Admin" => "Admin",
+"Admin" => "Kudeatzailea",
"Help" => "Laguntza",
"Access forbidden" => "Sarrera debekatuta",
"Cloud not found" => "Ez da hodeia aurkitu",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ff73e80448..e6f5aaac0c 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -54,7 +54,7 @@
"The app name is not specified." => "نام برنامه تعیین نشده است.",
"The required file {file} is not installed!" => "پرونده { پرونده} درخواست شده نصب نشده است !",
"Shared" => "اشتراک گذاشته شده",
-"Share" => "اشتراک‌گذاری",
+"Share" => "اشتراک‌گزاری",
"Error while sharing" => "خطا درØال به اشتراک گذاشتن",
"Error while unsharing" => "خطا درØال لغو اشتراک",
"Error while changing permissions" => "خطا در Øال تغییر مجوز",
@@ -89,20 +89,22 @@
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استÙاده کنید :\n{link}",
"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی Øاوی یک لینک جهت بازسازی گذرواژه دریاÙت خواهید کرد.",
-"Username" => "نام کاربری",
+"Reset email send." => "تنظیم مجدد ایمیل را بÙرستید.",
+"Request failed!" => "درخواست رد شده است !",
+"Username" => "شناسه",
"Request reset" => "درخواست دوباره سازی",
"Your password was reset" => "گذرواژه شما تغییرکرد",
"To login page" => "به صÙØÙ‡ ورود",
"New password" => "گذرواژه جدید",
"Reset password" => "دوباره سازی گذرواژه",
"Personal" => "شخصی",
-"Users" => "کاربران",
-"Apps" => " برنامه ها",
+"Users" => "کاربر ها",
+"Apps" => "برنامه",
"Admin" => "مدیر",
-"Help" => "راه‌نما",
+"Help" => "Ú©Ù…Ú©",
"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
"Cloud not found" => "پیدا نشد",
-"Edit categories" => "ویرایش گروه",
+"Edit categories" => "ویرایش گروه ها",
"Add" => "اÙزودن",
"Security Warning" => "اخطار امنیتی",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ÛŒ PHP شما در برابر Øملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
@@ -112,7 +114,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ùایلها Ùˆ Ùهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه Ùایل htacces. کار نمی کند.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "برای مطلع شدن از چگونگی تنظیم سرورتان،لطÙا <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">این</a> را ببینید.",
"Create an <strong>admin account</strong>" => "لطÙا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Advanced" => "پیشرÙته",
+"Advanced" => "ØرÙÙ‡ ای",
"Data folder" => "پوشه اطلاعاتی",
"Configure the database" => "پایگاه داده برنامه ریزی شدند",
"will be used" => "استÙاده خواهد شد",
@@ -122,7 +124,7 @@
"Database tablespace" => "جدول پایگاه داده",
"Database host" => "هاست پایگاه داده",
"Finish setup" => "اتمام نصب",
-"web services under your control" => "سرویس های تØت وب در کنترل شما",
+"web services under your control" => "سرویس وب تØت کنترل شما",
"Log out" => "خروج",
"Automatic logon rejected!" => "ورود به سیستم اتوماتیک ردشد!",
"If you did not change your password recently, your account may be compromised!" => "اگر شما اخیرا رمزعبور را تغییر نداده اید، Øساب شما در معرض خطر Ù…ÛŒ باشد !",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3f50e81484..ec79d03122 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -9,25 +9,25 @@
"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
-"Sunday" => "sunnuntai",
-"Monday" => "maanantai",
-"Tuesday" => "tiistai",
-"Wednesday" => "keskiviikko",
-"Thursday" => "torstai",
-"Friday" => "perjantai",
-"Saturday" => "lauantai",
-"January" => "tammikuu",
-"February" => "helmikuu",
-"March" => "maaliskuu",
-"April" => "huhtikuu",
-"May" => "toukokuu",
-"June" => "kesäkuu",
-"July" => "heinäkuu",
-"August" => "elokuu",
-"September" => "syyskuu",
-"October" => "lokakuu",
-"November" => "marraskuu",
-"December" => "joulukuu",
+"Sunday" => "Sunnuntai",
+"Monday" => "Maanantai",
+"Tuesday" => "Tiistai",
+"Wednesday" => "Keskiviikko",
+"Thursday" => "Torstai",
+"Friday" => "Perjantai",
+"Saturday" => "Lauantai",
+"January" => "Tammikuu",
+"February" => "Helmikuu",
+"March" => "Maaliskuu",
+"April" => "Huhtikuu",
+"May" => "Toukokuu",
+"June" => "Kesäkuu",
+"July" => "Heinäkuu",
+"August" => "Elokuu",
+"September" => "Syyskuu",
+"October" => "Lokakuu",
+"November" => "Marraskuu",
+"December" => "Joulukuu",
"Settings" => "Asetukset",
"seconds ago" => "sekuntia sitten",
"1 minute ago" => "1 minuutti sitten",
@@ -85,16 +85,18 @@
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
+"Reset email send." => "Salasanan nollausviesti lähetetty.",
+"Request failed!" => "Pyyntö epäonnistui!",
"Username" => "Käyttäjätunnus",
"Request reset" => "Tilaus lähetetty",
"Your password was reset" => "Salasanasi nollattiin",
"To login page" => "Kirjautumissivulle",
"New password" => "Uusi salasana",
"Reset password" => "Palauta salasana",
-"Personal" => "Henkilökohtainen",
+"Personal" => "Henkilökohtaiset",
"Users" => "Käyttäjät",
"Apps" => "Sovellukset",
-"Admin" => "Ylläpitäjä",
+"Admin" => "Hallinta",
"Help" => "Ohje",
"Access forbidden" => "Pääsy estetty",
"Cloud not found" => "Pilveä ei löydy",
@@ -103,7 +105,6 @@
"Security Warning" => "Turvallisuusvaroitus",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Päivitä PHP-asennuksesi käyttääksesi ownCloudia turvallisesti.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Katso palvelimen asetuksien määrittämiseen liittyvät ohjeet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaatiosta</a>.",
"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index c8f60a678f..3b89d69b3b 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Type d'objet non spécifié.",
"%s ID not provided." => "L'identifiant de %s n'est pas spécifié.",
"Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
-"No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.",
+"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
"Sunday" => "Dimanche",
"Monday" => "Lundi",
@@ -88,23 +88,23 @@
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
+"Reset email send." => "Mail de réinitialisation envoyé.",
+"Request failed!" => "La requête a échoué !",
"Username" => "Nom d'utilisateur",
"Request reset" => "Demander la réinitialisation",
"Your password was reset" => "Votre mot de passe a été réinitialisé",
"To login page" => "Retour à la page d'authentification",
"New password" => "Nouveau mot de passe",
"Reset password" => "Réinitialiser le mot de passe",
-"Personal" => "Personnel",
+"Personal" => "Personnels",
"Users" => "Utilisateurs",
"Apps" => "Applications",
"Admin" => "Administration",
"Help" => "Aide",
"Access forbidden" => "Accès interdit",
"Cloud not found" => "Introuvable",
-"Edit categories" => "Editer les catégories",
+"Edit categories" => "Modifier les catégories",
"Add" => "Ajouter",
"Security Warning" => "Avertissement de sécurité",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index f6c36d6ac6..fd237a39c8 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -9,7 +9,7 @@
"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.",
-"No categories selected for deletion." => "Non se seleccionaron categorÃas para eliminación.",
+"No categories selected for deletion." => "Non hai categorÃas seleccionadas para eliminar.",
"Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.",
"Sunday" => "Domingo",
"Monday" => "Luns",
@@ -30,11 +30,11 @@
"October" => "outubro",
"November" => "novembro",
"December" => "decembro",
-"Settings" => "Axustes",
+"Settings" => "Configuracións",
"seconds ago" => "segundos atrás",
"1 minute ago" => "hai 1 minuto",
"{minutes} minutes ago" => "hai {minutes} minutos",
-"1 hour ago" => "Vai 1 hora",
+"1 hour ago" => "hai 1 hora",
"{hours} hours ago" => "hai {hours} horas",
"today" => "hoxe",
"yesterday" => "onte",
@@ -88,9 +88,9 @@
"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}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aà pregúntelle ao seu administrador local..",
-"Request failed!<br>Did you make sure your email/username was right?" => "Non foi posÃbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.",
"You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
+"Reset email send." => "Restabelecer o envÃo por correo.",
+"Request failed!" => "Non foi posÃbel facer a petición",
"Username" => "Nome de usuario",
"Request reset" => "Petición de restabelecemento",
"Your password was reset" => "O contrasinal foi restabelecido",
@@ -100,11 +100,11 @@
"Personal" => "Persoal",
"Users" => "Usuarios",
"Apps" => "Aplicativos",
-"Admin" => "Administración",
+"Admin" => "Admin",
"Help" => "Axuda",
"Access forbidden" => "Acceso denegado",
"Cloud not found" => "Nube non atopada",
-"Edit categories" => "Editar as categorÃas",
+"Edit categories" => "Editar categorÃas",
"Add" => "Engadir",
"Security Warning" => "Aviso de seguranza",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f161c356ca..56f273e95d 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -63,7 +63,7 @@
"Share with" => "שיתוף ×¢×",
"Share with link" => "שיתוף ×¢× ×§×™×©×•×¨",
"Password protect" => "×”×’× ×” בססמה",
-"Password" => "סיסמ×",
+"Password" => "ססמה",
"Email link to person" => "שליחת קישור בדו×״ל למשתמש",
"Send" => "שליחה",
"Set expiration date" => "הגדרת ת×ריך תפוגה",
@@ -89,6 +89,8 @@
"ownCloud password reset" => "×יפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור ×”×‘× ×›×“×™ ל×פס ×ת הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדו×״ל שלך קישור ל×יפוס הססמה.",
+"Reset email send." => "×יפוס שליחת דו×״ל.",
+"Request failed!" => "הבקשה × ×›×©×œ×”!",
"Username" => "×©× ×ž×©×ª×ž×©",
"Request reset" => "בקשת ×יפוס",
"Your password was reset" => "הססמה שלך ×ופסה",
@@ -102,7 +104,7 @@
"Help" => "עזרה",
"Access forbidden" => "הגישה × ×—×¡×ž×”",
"Cloud not found" => "×¢× ×Ÿ ×œ× × ×ž×¦×",
-"Edit categories" => "ערוך קטגוריות",
+"Edit categories" => "עריכת הקטגוריות",
"Add" => "הוספה",
"Security Warning" => "×זהרת ×בטחה",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "×ין מחולל ×ž×¡×¤×¨×™× ×קר××™×™× ×ž×ובטח, × × ×œ×”×¤×¢×™×œ ×ת ההרחבה OpenSSL ב־PHP.",
@@ -120,7 +122,7 @@
"Database tablespace" => "מרחב הכתובות של מסד ×”× ×ª×•× ×™×",
"Database host" => "שרת בסיס × ×ª×•× ×™×",
"Finish setup" => "×¡×™×•× ×”×ª×§× ×”",
-"web services under your control" => "שירותי רשת תחת השליטה שלך",
+"web services under your control" => "שירותי רשת בשליטתך",
"Log out" => "×”×ª× ×ª×§×•×ª",
"Automatic logon rejected!" => "בקשת ×”×›× ×™×¡×” ×”×וטומטית × ×“×—×ª×”!",
"If you did not change your password recently, your account may be compromised!" => "×× ×œ× ×©×™× ×™×ª ×ת ססמתך ל××—×¨×•× ×”, יתכן ×©×—×©×‘×•× ×š × ×¤×’×¢!",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index e79e71d4b2..d32d8d4b22 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"No category to add?" => "Nemate kategorija koje možete dodati?",
-"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
+"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
"Sunday" => "nedelja",
"Monday" => "ponedeljak",
"Tuesday" => "utorak",
@@ -33,7 +33,7 @@
"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
-"Error" => "Greška",
+"Error" => "Pogreška",
"Share" => "Podijeli",
"Error while sharing" => "Greška prilikom djeljenja",
"Error while unsharing" => "GreÅ¡ka prilikom iskljuÄivanja djeljenja",
@@ -76,7 +76,7 @@
"Edit categories" => "Uredi kategorije",
"Add" => "Dodaj",
"Create an <strong>admin account</strong>" => "Stvori <strong>administratorski raÄun</strong>",
-"Advanced" => "Napredno",
+"Advanced" => "Dodatno",
"Data folder" => "Mapa baze podataka",
"Configure the database" => "Konfiguriraj bazu podataka",
"will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 013d68dff5..eb0a3d1a91 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -45,7 +45,7 @@
"last year" => "tavaly",
"years ago" => "több éve",
"Ok" => "Ok",
-"Cancel" => "Mégsem",
+"Cancel" => "Mégse",
"Choose" => "Válasszon",
"Yes" => "Igen",
"No" => "Nem",
@@ -89,16 +89,18 @@
"ownCloud password reset" => "ownCloud jelszó-visszaállÃtás",
"Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállÃtásához: {link}",
"You will receive a link to reset your password via Email." => "Egy emailben fog értesÃtést kapni a jelszóbeállÃtás módjáról.",
+"Reset email send." => "Elküldtük az emailt a jelszó ismételt beállÃtásához.",
+"Request failed!" => "Nem sikerült a kérést teljesÃteni!",
"Username" => "Felhasználónév",
"Request reset" => "VisszaállÃtás igénylése",
"Your password was reset" => "Jelszó megváltoztatva",
"To login page" => "A bejelentkező ablakhoz",
-"New password" => "Az új jelszó",
+"New password" => "Új jelszó",
"Reset password" => "Jelszó-visszaállÃtás",
"Personal" => "Személyes",
"Users" => "Felhasználók",
"Apps" => "Alkalmazások",
-"Admin" => "Adminsztráció",
+"Admin" => "Adminisztráció",
"Help" => "Súgó",
"Access forbidden" => "A hozzáférés nem engedélyezett",
"Cloud not found" => "A felhő nem található",
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
deleted file mode 100644
index de0c725c73..0000000000
--- a/core/l10n/hy.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Sunday" => "Ô¿Õ«Ö€Õ¡Õ¯Õ«",
-"Monday" => "ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«",
-"Tuesday" => "ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
-"Wednesday" => "Õ‰Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
-"Thursday" => "Õ€Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«",
-"Friday" => "ÕˆÖ‚Ö€Õ¢Õ¡Õ©",
-"Saturday" => "Õ‡Õ¡Õ¢Õ¡Õ©",
-"January" => "Õ€Õ¸Ö‚Õ¶Õ¾Õ¡Ö€",
-"February" => "Õ“Õ¥Õ¿Ö€Õ¾Õ¡Ö€",
-"March" => "Õ„Õ¡Ö€Õ¿",
-"April" => "Ô±ÕºÖ€Õ«Õ¬",
-"May" => "Õ„Õ¡ÕµÕ«Õ½",
-"June" => "Õ€Õ¸Ö‚Õ¶Õ«Õ½",
-"July" => "Õ€Õ¸Ö‚Õ¬Õ«Õ½",
-"August" => "Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½",
-"September" => "ÕÕ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€",
-"October" => "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
-"November" => "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€",
-"December" => "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
-);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 984822af1e..9eeaba3454 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -45,7 +45,7 @@
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
"Ok" => "Oke",
-"Cancel" => "Batal",
+"Cancel" => "Batalkan",
"Choose" => "Pilih",
"Yes" => "Ya",
"No" => "Tidak",
@@ -89,7 +89,9 @@
"ownCloud password reset" => "Setel ulang sandi ownCloud",
"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
"You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-"Username" => "Nama pengguna",
+"Reset email send." => "Email penyetelan ulang dikirim.",
+"Request failed!" => "Permintaan gagal!",
+"Username" => "Nama Pengguna",
"Request reset" => "Ajukan penyetelan ulang",
"Your password was reset" => "Sandi Anda telah disetel ulang",
"To login page" => "Ke halaman masuk",
@@ -103,7 +105,7 @@
"Access forbidden" => "Akses ditolak",
"Cloud not found" => "Cloud tidak ditemukan",
"Edit categories" => "Edit kategori",
-"Add" => "Tambah",
+"Add" => "Tambahkan",
"Security Warning" => "Peringatan Keamanan",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
"Please update your PHP installation to use ownCloud securely." => "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman.",
@@ -112,7 +114,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Untuk informasi lebih lanjut tentang pengaturan server yang benar, silakan lihat <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasi</a>.",
"Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Advanced" => "Lanjutan",
+"Advanced" => "Tingkat Lanjut",
"Data folder" => "Folder data",
"Configure the database" => "Konfigurasikan basis data",
"will be used" => "akan digunakan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index d30d8bca11..c6b7a6df32 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -30,8 +30,8 @@
"November" => "Nóvember",
"December" => "Desember",
"Settings" => "Stillingar",
-"seconds ago" => "sek.",
-"1 minute ago" => "Fyrir 1 mÃnútu",
+"seconds ago" => "sek sÃðan",
+"1 minute ago" => "1 min sÃðan",
"{minutes} minutes ago" => "{minutes} min sÃðan",
"1 hour ago" => "Fyrir 1 klst.",
"{hours} hours ago" => "fyrir {hours} klst.",
@@ -42,7 +42,7 @@
"{months} months ago" => "fyrir {months} mánuðum",
"months ago" => "mánuðir sÃðan",
"last year" => "sÃðasta ári",
-"years ago" => "einhverjum árum",
+"years ago" => "árum sÃðan",
"Ok" => "Ã lagi",
"Cancel" => "Hætta við",
"Choose" => "Veldu",
@@ -85,21 +85,23 @@
"ownCloud password reset" => "endursetja ownCloud lykilorð",
"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
"You will receive a link to reset your password via Email." => "Þú munt fá veftengil à tölvupósti til að endursetja lykilorðið.",
+"Reset email send." => "Beiðni um endursetningu send.",
+"Request failed!" => "Beiðni mistókst!",
"Username" => "Notendanafn",
"Request reset" => "Endursetja lykilorð",
"Your password was reset" => "Lykilorðið þitt hefur verið endursett.",
"To login page" => "Fara á innskráningarsÃðu",
"New password" => "Nýtt lykilorð",
"Reset password" => "Endursetja lykilorð",
-"Personal" => "Um mig",
+"Personal" => "Persónustillingar",
"Users" => "Notendur",
"Apps" => "Forrit",
-"Admin" => "Stjórnun",
+"Admin" => "Vefstjórn",
"Help" => "Hjálp",
"Access forbidden" => "Aðgangur bannaður",
"Cloud not found" => "Ský finnst ekki",
"Edit categories" => "Breyta flokkum",
-"Add" => "Bæta við",
+"Add" => "Bæta",
"Security Warning" => "Öryggis aðvörun",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi à boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ãn öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index d450f90b1d..d24c3330bf 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -77,8 +77,8 @@
"access control" => "controllo d'accesso",
"create" => "creare",
"update" => "aggiornare",
-"delete" => "elimina",
-"share" => "condividi",
+"delete" => "eliminare",
+"share" => "condividere",
"Password protected" => "Protetta da password",
"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
"Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
"ownCloud password reset" => "Ripristino password di ownCloud",
"Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
"You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
+"Reset email send." => "Email di ripristino inviata.",
+"Request failed!" => "Richiesta non riuscita!",
"Username" => "Nome utente",
"Request reset" => "Richiesta di ripristino",
"Your password was reset" => "La password è stata ripristinata",
@@ -104,7 +104,7 @@
"Help" => "Aiuto",
"Access forbidden" => "Accesso negato",
"Cloud not found" => "Nuvola non trovata",
-"Edit categories" => "Modifica categorie",
+"Edit categories" => "Modifica le categorie",
"Add" => "Aggiungi",
"Security Warning" => "Avviso di sicurezza",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
@@ -114,7 +114,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il server, vedi la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentazione</a>.",
"Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Advanced" => "Avanzat",
+"Advanced" => "Avanzate",
"Data folder" => "Cartella dati",
"Configure the database" => "Configura il database",
"will be used" => "sarà utilizzato",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 056c67e8da..200e494d8c 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -89,16 +89,18 @@
"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." => "メールã§ãƒ‘スワードをリセットã™ã‚‹ãƒªãƒ³ã‚¯ãŒå±Šãã¾ã™ã€‚",
-"Username" => "ユーザーå",
+"Reset email send." => "リセットメールをé€ä¿¡ã—ã¾ã™ã€‚",
+"Request failed!" => "リクエスト失敗ï¼",
+"Username" => "ユーザå",
"Request reset" => "リセットをè¦æ±‚ã—ã¾ã™ã€‚",
"Your password was reset" => "ã‚ãªãŸã®ãƒ‘スワードã¯ãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã—ãŸã€‚",
"To login page" => "ãƒã‚°ã‚¤ãƒ³ãƒšãƒ¼ã‚¸ã¸æˆ»ã‚‹",
"New password" => "æ–°ã—ã„パスワードを入力",
"Reset password" => "パスワードをリセット",
-"Personal" => "個人",
+"Personal" => "個人è¨å®š",
"Users" => "ユーザ",
"Apps" => "アプリ",
-"Admin" => "管ç†",
+"Admin" => "管ç†è€…",
"Help" => "ヘルプ",
"Access forbidden" => "アクセスãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™",
"Cloud not found" => "見ã¤ã‹ã‚Šã¾ã›ã‚“",
@@ -122,7 +124,7 @@
"Database tablespace" => "データベースã®è¡¨é ˜åŸŸ",
"Database host" => "データベースã®ãƒ›ã‚¹ãƒˆå",
"Finish setup" => "セットアップを完了ã—ã¾ã™",
-"web services under your control" => "管ç†ä¸‹ã®ã‚¦ã‚§ãƒ–サービス",
+"web services under your control" => "管ç†ä¸‹ã«ã‚るウェブサービス",
"Log out" => "ãƒã‚°ã‚¢ã‚¦ãƒˆ",
"Automatic logon rejected!" => "自動ãƒã‚°ã‚¤ãƒ³ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼",
"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更ã—ã¦ã„ãªã„å ´åˆã€ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯å±é™ºã«ã•ã‚‰ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index fd2e512654..190a2f5eab 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -60,7 +60,7 @@
"Error while changing permissions" => "შეცდáƒáƒ›áƒ დáƒáƒ¨áƒ•áƒ”ბის ცვლილების დრáƒáƒ¡",
"Shared with you and the group {group} by {owner}" => "გáƒáƒ–იáƒáƒ დრთქვენთვის დრჯგუფისთვის {group}, {owner}–ის მიერ",
"Shared with you by {owner}" => "გáƒáƒ–იáƒáƒ დრთქვენთვის {owner}–ის მიერ",
-"Share with" => "გáƒáƒáƒ–იáƒáƒ ე შემდეგით:",
+"Share with" => "გáƒáƒ£áƒ–იáƒáƒ ე",
"Share with link" => "გáƒáƒ£áƒ–იáƒáƒ ე ლინკით",
"Password protect" => "პáƒáƒ áƒáƒšáƒ˜áƒ— დáƒáƒªáƒ•áƒ",
"Password" => "პáƒáƒ áƒáƒšáƒ˜",
@@ -72,7 +72,7 @@
"No people found" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი áƒáƒ áƒáƒ ის ნáƒáƒžáƒáƒ•áƒœáƒ˜",
"Resharing is not allowed" => "მეáƒáƒ ეჯერგáƒáƒ–იáƒáƒ ებრáƒáƒ áƒáƒ ის დáƒáƒ¨áƒ•áƒ”ბული",
"Shared in {item} with {user}" => "გáƒáƒ–იáƒáƒ დრ{item}–ში {user}–ის მიერ",
-"Unshare" => "გáƒáƒ£áƒ–იáƒáƒ ებáƒáƒ“ი",
+"Unshare" => "გáƒáƒ–იáƒáƒ ების მáƒáƒ®áƒ¡áƒœáƒ",
"can edit" => "შეგიძლირშეცვლáƒ",
"access control" => "დáƒáƒ¨áƒ•áƒ”ბის კáƒáƒœáƒ¢áƒ áƒáƒšáƒ˜",
"create" => "შექმნáƒ",
@@ -89,16 +89,18 @@
"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." => "თქვენ მáƒáƒ’ივáƒáƒ— პáƒáƒ áƒáƒšáƒ˜áƒ¡ შესáƒáƒªáƒ•áƒšáƒ”ლი ლინკი მეილზე",
-"Username" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი",
+"Reset email send." => "რესეტის მეილი გáƒáƒ˜áƒ’ზáƒáƒ•áƒœáƒ",
+"Request failed!" => "მáƒáƒ—ხáƒáƒ•áƒœáƒ შეწყდáƒ!",
+"Username" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი",
"Request reset" => "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლის მáƒáƒ—ხáƒáƒ•áƒœáƒ",
"Your password was reset" => "თქვენი პáƒáƒ áƒáƒšáƒ˜ შეცვლილიáƒ",
"To login page" => "შესვლის გვერდზე",
"New password" => "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜",
"Reset password" => "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ",
"Personal" => "პირáƒáƒ“ი",
-"Users" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი",
+"Users" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლები",
"Apps" => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბი",
-"Admin" => "áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი",
+"Admin" => "áƒáƒ“მინი",
"Help" => "დáƒáƒ®áƒ›áƒáƒ ებáƒ",
"Access forbidden" => "წვდáƒáƒ›áƒ áƒáƒ™áƒ ძáƒáƒšáƒ£áƒšáƒ˜áƒ",
"Cloud not found" => "ღრუბელი áƒáƒ áƒáƒ სებáƒáƒ‘ს",
@@ -122,7 +124,7 @@
"Database tablespace" => "ბáƒáƒ–ის ცხრილის ზáƒáƒ›áƒ",
"Database host" => "მáƒáƒœáƒáƒªáƒ”მთრბáƒáƒ–ის ჰáƒáƒ¡áƒ¢áƒ˜",
"Finish setup" => "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ˜áƒ¡ დáƒáƒ¡áƒ ულებáƒ",
-"web services under your control" => "web services under your control",
+"web services under your control" => "თქვენი კáƒáƒœáƒ¢áƒ áƒáƒšáƒ˜áƒ¡ ქვეშ მყáƒáƒ¤áƒ˜ ვებ სერვისები",
"Log out" => "გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ",
"Automatic logon rejected!" => "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ ი შესვლრუáƒáƒ ყáƒáƒ¤áƒ˜áƒšáƒ˜áƒ!",
"If you did not change your password recently, your account may be compromised!" => "თუ თქვენ áƒáƒ შეცვლით პáƒáƒ áƒáƒšáƒ¡, თქვენი áƒáƒœáƒ’áƒáƒ იში შეიძლებრიყáƒáƒ¡ დáƒáƒ¨áƒ•áƒ”ბáƒáƒ“ი სხვებისთვის",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 08713edaee..2a75ce9c4f 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -5,11 +5,10 @@
"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ì„(를) ì¶”ê°€í• ìˆ˜ 없었습니다.",
-"No categories selected for deletion." => "ì‚ì œí• ë¶„ë¥˜ë¥¼ ì„ íƒí•˜ì§€ 않았습니다. ",
+"No categories selected for deletion." => "ì‚ì œí• ë¶„ë¥˜ë¥¼ ì„ íƒí•˜ì§€ 않았습니다.",
"Error removing %s from favorites." => "책갈피ì—ì„œ %sì„(를) ì‚ì œí• ìˆ˜ 없었습니다.",
"Sunday" => "ì¼ìš”ì¼",
"Monday" => "월요ì¼",
@@ -75,7 +74,7 @@
"Unshare" => "ê³µìœ í•´ì œ",
"can edit" => "편집 가능",
"access control" => "ì ‘ê·¼ ì œì–´",
-"create" => "ìƒì„±",
+"create" => "만들기",
"update" => "ì—…ë°ì´íŠ¸",
"delete" => "ì‚ì œ",
"share" => "ê³µìœ ",
@@ -89,6 +88,8 @@
"ownCloud password reset" => "ownCloud 암호 ìž¬ì„¤ì •",
"Use the following link to reset your password: {link}" => "ë‹¤ìŒ ë§í¬ë¥¼ 사용하여 암호를 ìž¬ì„¤ì •í• ìˆ˜ 있습니다: {link}",
"You will receive a link to reset your password via Email." => "ì´ë©”ì¼ë¡œ 암호 ìž¬ì„¤ì • ë§í¬ë¥¼ 보냈습니다.",
+"Reset email send." => "초기화 ì´ë©”ì¼ì„ 보냈습니다.",
+"Request failed!" => "ìš”ì²ì´ 실패했습니다!",
"Username" => "ì‚¬ìš©ìž ì´ë¦„",
"Request reset" => "ìš”ì² ì´ˆê¸°í™”",
"Your password was reset" => "암호가 ìž¬ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤",
@@ -102,15 +103,11 @@
"Help" => "ë„움ë§",
"Access forbidden" => "ì ‘ê·¼ 금지ë¨",
"Cloud not found" => "í´ë¼ìš°ë“œë¥¼ ì°¾ì„ ìˆ˜ 없습니다",
-"Edit categories" => "분류 ìˆ˜ì •",
+"Edit categories" => "분류 편집",
"Add" => "추가",
"Security Warning" => "보안 ê²½ê³ ",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "사용 ì¤‘ì¸ PHP ë²„ì „ì´ NULL ë°”ì´íŠ¸ ê³µê²©ì— ì·¨ì•½í•©ë‹ˆë‹¤ (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ownCloudì˜ ë³´ì•ˆì„ ìœ„í•˜ì—¬ PHP ë²„ì „ì„ ì—…ë°ì´íŠ¸í•˜ì‹ì‹œì˜¤.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "ì•ˆì „í•œ 난수 ìƒì„±ê¸°ë¥¼ ì‚¬ìš©í• ìˆ˜ 없습니다. PHPì˜ OpenSSL í™•ìž¥ì„ í™œì„±í™”í•´ 주ì‹ì‹œì˜¤.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ì•ˆì „í•œ 난수 ìƒì„±ê¸°ë¥¼ 사용하지 않으면 공격ìžê°€ 암호 초기화 í† í°ì„ 추측하여 ê³„ì •ì„ íƒˆì·¨í• ìˆ˜ 있습니다.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파ì¼ì´ 처리ë˜ì§€ ì•Šì•„ì„œ ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ 파ì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í• ìˆ˜ ì—†ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "서버를 올바르게 ì„¤ì •í•˜ëŠ” ë°©ë²•ì„ ì•Œì•„ë³´ë ¤ë©´ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">문서</a>를 ì°¸ê³ í•˜ì‹ì‹œì˜¤..",
"Create an <strong>admin account</strong>" => "<strong>ê´€ë¦¬ìž ê³„ì •</strong> 만들기",
"Advanced" => "ê³ ê¸‰",
"Data folder" => "ë°ì´í„° í´ë”",
@@ -130,7 +127,6 @@
"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/core/l10n/lb.php b/core/l10n/lb.php
index f2277445f9..79258b8e97 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -57,7 +57,7 @@
"Access forbidden" => "Access net erlaabt",
"Cloud not found" => "Cloud net fonnt",
"Edit categories" => "Kategorien editéieren",
-"Add" => "Dobäisetzen",
+"Add" => "Bäisetzen",
"Security Warning" => "Sécherheets Warnung",
"Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
"Advanced" => "Avancéiert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 05ae35cc3d..0f55c341e5 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -53,7 +53,7 @@
"No people found" => "Žmonių nerasta",
"Resharing is not allowed" => "Dalijinasis išnaujo negalimas",
"Shared in {item} with {user}" => "Pasidalino {item} su {user}",
-"Unshare" => "Nebesidalinti",
+"Unshare" => "Nesidalinti",
"can edit" => "gali redaguoti",
"access control" => "priÄ—jimo kontrolÄ—",
"create" => "sukurti",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 18af82e4e3..76188662fb 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Objekta tips nav norÄdÄ«ts.",
"%s ID not provided." => "%s ID nav norÄdÄ«ts.",
"Error adding %s to favorites." => "Kļūda, pievienojot %s izlasei.",
-"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai.",
+"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai",
"Error removing %s from favorites." => "Kļūda, izņemot %s no izlases.",
"Sunday" => "Svētdiena",
"Monday" => "Pirmdiena",
@@ -72,7 +72,7 @@
"No people found" => "Nav atrastu cilvēku",
"Resharing is not allowed" => "AtkÄrtota dalÄ«Å¡anÄs nav atļauta",
"Shared in {item} with {user}" => "DalÄ«jÄs ar {item} ar {user}",
-"Unshare" => "PÄrtraukt dalÄ«Å¡anos",
+"Unshare" => "Beigt dalīties",
"can edit" => "var rediģēt",
"access control" => "piekļuves vadība",
"create" => "izveidot",
@@ -89,6 +89,8 @@
"ownCloud password reset" => "ownCloud paroles maiņa",
"Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
"You will receive a link to reset your password via Email." => "JÅ«s savÄ epastÄ saņemsiet interneta saiti, caur kuru varÄ“siet atjaunot paroli.",
+"Reset email send." => "Atstatīt e-pasta sūtīšanu.",
+"Request failed!" => "PieprasÄ«jums neizdevÄs!",
"Username" => "LietotÄjvÄrds",
"Request reset" => "Pieprasīt paroles maiņu",
"Your password was reset" => "Jūsu parole tika nomainīta",
@@ -98,7 +100,7 @@
"Personal" => "Personīgi",
"Users" => "LietotÄji",
"Apps" => "Lietotnes",
-"Admin" => "Administratori",
+"Admin" => "Administrators",
"Help" => "Palīdzība",
"Access forbidden" => "Pieeja ir liegta",
"Cloud not found" => "MÄkonis netika atrasts",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index a6c06e4780..9743d8b299 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -29,7 +29,7 @@
"October" => "Октомври",
"November" => "Ðоември",
"December" => "Декември",
-"Settings" => "ПодеÑувања",
+"Settings" => "ПоÑтавки",
"seconds ago" => "пред Ñекунди",
"1 minute ago" => "пред 1 минута",
"{minutes} minutes ago" => "пред {minutes} минути",
@@ -85,6 +85,8 @@
"ownCloud password reset" => "реÑетирање на лозинка за ownCloud",
"Use the following link to reset your password: {link}" => "КориÑтете ја Ñледната врÑка да ја реÑетирате Вашата лозинка: {link}",
"You will receive a link to reset your password via Email." => "Ќе добиете врÑка по е-пошта за да може да ја реÑетирате Вашата лозинка.",
+"Reset email send." => "Порката за реÑетирање на лозинка пратена.",
+"Request failed!" => "Барањето не уÑпеа!",
"Username" => "КориÑничко име",
"Request reset" => "Побарајте реÑетирање",
"Your password was reset" => "Вашата лозинка беше реÑетирана",
@@ -93,7 +95,7 @@
"Reset password" => "РеÑетирај лозинка",
"Personal" => "Лично",
"Users" => "КориÑници",
-"Apps" => "Ðппликации",
+"Apps" => "Ðпликации",
"Admin" => "Ðдмин",
"Help" => "Помош",
"Access forbidden" => "Забранет приÑтап",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 70581ff769..d8a2cf8836 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"No category to add?" => "Tiada kategori untuk di tambah?",
-"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
+"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
"Sunday" => "Ahad",
"Monday" => "Isnin",
"Tuesday" => "Selasa",
@@ -44,7 +44,7 @@
"Help" => "Bantuan",
"Access forbidden" => "Larangan akses",
"Cloud not found" => "Awan tidak dijumpai",
-"Edit categories" => "Ubah kategori",
+"Edit categories" => "Edit kategori",
"Add" => "Tambah",
"Security Warning" => "Amaran keselamatan",
"Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 6efb31a7de..4e1ee45eec 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -92,7 +92,7 @@
"Database tablespace" => "Database tabellområde",
"Database host" => "Databasevert",
"Finish setup" => "Fullfør oppsetting",
-"web services under your control" => "web tjenester du kontrollerer",
+"web services under your control" => "nettjenester under din kontroll",
"Log out" => "Logg ut",
"Automatic logon rejected!" => "Automatisk pålogging avvist!",
"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 83d1e82dc3..5e050c33be 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -45,7 +45,7 @@
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
"Ok" => "Ok",
-"Cancel" => "Annuleer",
+"Cancel" => "Annuleren",
"Choose" => "Kies",
"Yes" => "Ja",
"No" => "Nee",
@@ -75,7 +75,7 @@
"Unshare" => "Stop met delen",
"can edit" => "kan wijzigen",
"access control" => "toegangscontrole",
-"create" => "creëer",
+"create" => "maak",
"update" => "bijwerken",
"delete" => "verwijderen",
"share" => "deel",
@@ -88,14 +88,14 @@
"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
"ownCloud password reset" => "ownCloud wachtwoord herstellen",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+"Reset email send." => "Reset e-mail verstuurd.",
+"Request failed!" => "Verzoek mislukt!",
"Username" => "Gebruikersnaam",
"Request reset" => "Resetaanvraag",
"Your password was reset" => "Je wachtwoord is gewijzigd",
"To login page" => "Naar de login-pagina",
-"New password" => "Nieuw",
+"New password" => "Nieuw wachtwoord",
"Reset password" => "Reset wachtwoord",
"Personal" => "Persoonlijk",
"Users" => "Gebruikers",
@@ -104,7 +104,7 @@
"Help" => "Help",
"Access forbidden" => "Toegang verboden",
"Cloud not found" => "Cloud niet gevonden",
-"Edit categories" => "Wijzig categorieën",
+"Edit categories" => "Wijzigen categorieën",
"Add" => "Toevoegen",
"Security Warning" => "Beveiligingswaarschuwing",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index f62897ed27..61b2baffbf 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,16 +1,4 @@
<?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Brukaren %s delte ei fil med deg",
-"User %s shared a folder with you" => "Brukaren %s delte ei mappe med deg",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Brukaren %s delte fila «%s» med deg. Du kan lasta ho ned her: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Brukaren %s delte mappa «%s» med deg. Du kan lasta ho ned her: %s",
-"Category type not provided." => "Ingen kategoritype.",
-"No category to add?" => "Ingen kategori å leggja til?",
-"This category already exists: %s" => "Denne kategorien finst alt: %s",
-"Object type not provided." => "Ingen objekttype.",
-"%s ID not provided." => "Ingen %s-ID.",
-"Error adding %s to favorites." => "Klarte ikkje å leggja til %s i favorittar.",
-"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
-"Error removing %s from favorites." => "Klarte ikkje å fjerna %s frå favorittar.",
"Sunday" => "Søndag",
"Monday" => "MÃ¥ndag",
"Tuesday" => "Tysdag",
@@ -31,88 +19,24 @@
"November" => "November",
"December" => "Desember",
"Settings" => "Innstillingar",
-"seconds ago" => "sekund sidan",
-"1 minute ago" => "1 minutt sidan",
-"{minutes} minutes ago" => "{minutes} minutt sidan",
-"1 hour ago" => "1 time sidan",
-"{hours} hours ago" => "{hours} timar sidan",
-"today" => "i dag",
-"yesterday" => "i går",
-"{days} days ago" => "{days} dagar sidan",
-"last month" => "førre månad",
-"{months} months ago" => "{months) månader sidan",
-"months ago" => "månader sidan",
-"last year" => "i fjor",
-"years ago" => "Ã¥r sidan",
-"Ok" => "Greitt",
-"Cancel" => "Avbryt",
-"Choose" => "Vel",
-"Yes" => "Ja",
-"No" => "Nei",
-"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
+"Cancel" => "Kanseller",
"Error" => "Feil",
-"The app name is not specified." => "App-namnet er ikkje spesifisert.",
-"The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
-"Shared" => "Delt",
-"Share" => "Del",
-"Error while sharing" => "Feil ved deling",
-"Error while unsharing" => "Feil ved udeling",
-"Error while changing permissions" => "Feil ved endring av tillatingar",
-"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
-"Shared with you by {owner}" => "Delt med deg av {owner}",
-"Share with" => "Del med",
-"Share with link" => "Del med lenkje",
-"Password protect" => "Passordvern",
"Password" => "Passord",
-"Email link to person" => "Send lenkja over e-post",
-"Send" => "Send",
-"Set expiration date" => "Set utlaupsdato",
-"Expiration date" => "Utlaupsdato",
-"Share via email:" => "Del over e-post:",
-"No people found" => "Fann ingen personar",
-"Resharing is not allowed" => "Vidaredeling er ikkje tillate",
-"Shared in {item} with {user}" => "Delt i {item} med {brukar}",
-"Unshare" => "Udel",
-"can edit" => "kan endra",
-"access control" => "tilgangskontroll",
-"create" => "lag",
-"update" => "oppdater",
-"delete" => "slett",
-"share" => "del",
-"Password protected" => "Passordverna",
-"Error unsetting expiration date" => "Klarte ikkje å fjerna utlaupsdato",
-"Error setting expiration date" => "Klarte ikkje å setja utlaupsdato",
-"Sending ..." => "Sender …",
-"Email sent" => "E-post sendt",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
-"ownCloud password reset" => "Nullstilling av ownCloud-passord",
-"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?",
-"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
+"Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
+"You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
"Username" => "Brukarnamn",
"Request reset" => "Be om nullstilling",
"Your password was reset" => "Passordet ditt er nullstilt",
-"To login page" => "Til innloggingssida",
+"To login page" => "Til innloggings sida",
"New password" => "Nytt passord",
"Reset password" => "Nullstill passord",
"Personal" => "Personleg",
"Users" => "Brukarar",
"Apps" => "Applikasjonar",
-"Admin" => "Admin",
+"Admin" => "Administrer",
"Help" => "Hjelp",
-"Access forbidden" => "Tilgang forbudt",
"Cloud not found" => "Fann ikkje skyen",
-"Edit categories" => "Endra kategoriar",
"Add" => "Legg til",
-"Security Warning" => "Tryggleiksåtvaring",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for å læra korleis du set opp tenaren din på rett måte.",
"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
@@ -121,19 +45,13 @@
"Database user" => "Databasebrukar",
"Database password" => "Databasepassord",
"Database name" => "Databasenamn",
-"Database tablespace" => "Tabellnamnrom for database",
"Database host" => "Databasetenar",
"Finish setup" => "Fullfør oppsettet",
-"web services under your control" => "Vevtenester under din kontroll",
+"web services under your control" => "Vev tjenester under din kontroll",
"Log out" => "Logg ut",
-"Automatic logon rejected!" => "Automatisk innlogging avvist!",
-"If you did not change your password recently, your account may be compromised!" => "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompromittert!",
-"Please change your password to secure your account again." => "Ver venleg og endra passordet for å gjera kontoen din trygg igjen.",
"Lost your password?" => "Gløymt passordet?",
"remember" => "hugs",
"Log in" => "Logg inn",
-"Alternative Logins" => "Alternative innloggingar",
"prev" => "førre",
-"next" => "neste",
-"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
+"next" => "neste"
);
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index a384b0315b..ec432d495a 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -8,16 +8,16 @@
"Thursday" => "Dijòus",
"Friday" => "Divendres",
"Saturday" => "Dissabte",
-"January" => "genièr",
-"February" => "febrièr",
-"March" => "març",
-"April" => "abril",
-"May" => "mai",
-"June" => "junh",
-"July" => "julhet",
-"August" => "agost",
-"September" => "septembre",
-"October" => "octobre",
+"January" => "Genièr",
+"February" => "Febrièr",
+"March" => "Març",
+"April" => "Abril",
+"May" => "Mai",
+"June" => "Junh",
+"July" => "Julhet",
+"August" => "Agost",
+"September" => "Septembre",
+"October" => "Octobre",
"November" => "Novembre",
"December" => "Decembre",
"Settings" => "Configuracion",
@@ -30,7 +30,7 @@
"last year" => "an passat",
"years ago" => "ans a",
"Ok" => "D'accòrdi",
-"Cancel" => "Annula",
+"Cancel" => "Anulla",
"Choose" => "CausÃs",
"Yes" => "Ã’c",
"No" => "Non",
@@ -48,7 +48,7 @@
"Share via email:" => "Parteja tras corrièl :",
"No people found" => "Deguns trobat",
"Resharing is not allowed" => "Tornar partejar es pas permis",
-"Unshare" => "Pas partejador",
+"Unshare" => "Non parteje",
"can edit" => "pòt modificar",
"access control" => "Contraròtle d'acces",
"create" => "crea",
@@ -61,11 +61,11 @@
"ownCloud password reset" => "senhal d'ownCloud tornat botar",
"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-"Username" => "Non d'usancièr",
+"Username" => "Nom d'usancièr",
"Request reset" => "Tornar botar requesit",
"Your password was reset" => "Ton senhal es estat tornat botar",
"To login page" => "Pagina cap al login",
-"New password" => "Senhal novèl",
+"New password" => "Senhal nòu",
"Reset password" => "Senhal tornat botar",
"Personal" => "Personal",
"Users" => "Usancièrs",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 22cc24cd51..2821bf77ee 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -89,6 +89,8 @@
"ownCloud password reset" => "restart hasła ownCloud",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {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.",
+"Reset email send." => "Wysłano e-mail resetujący.",
+"Request failed!" => "Żądanie nieudane!",
"Username" => "Nazwa użytkownika",
"Request reset" => "Żądanie resetowania",
"Your password was reset" => "Zresetowano hasło",
@@ -122,7 +124,7 @@
"Database tablespace" => "Obszar tabel bazy danych",
"Database host" => "Komputer bazy danych",
"Finish setup" => "Zakończ konfigurowanie",
-"web services under your control" => "Kontrolowane serwisy",
+"web services under your control" => "usługi internetowe pod kontrolą",
"Log out" => "Wyloguj",
"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
"If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index ee1ac44d02..e5acd4da8f 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -9,7 +9,7 @@
"Object type not provided." => "tipo de objeto não fornecido.",
"%s ID not provided." => "%s ID não fornecido(s).",
"Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
-"No categories selected for deletion." => "Nenhuma categoria selecionada para remoção.",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para excluir.",
"Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
"Sunday" => "Domingo",
"Monday" => "Segunda-feira",
@@ -30,7 +30,7 @@
"October" => "outubro",
"November" => "novembro",
"December" => "dezembro",
-"Settings" => "Ajustes",
+"Settings" => "Configurações",
"seconds ago" => "segundos atrás",
"1 minute ago" => "1 minuto atrás",
"{minutes} minutes ago" => "{minutes} minutos atrás",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
"ownCloud password reset" => "Redefinir senha ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um perÃodo razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local.",
-"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.",
-"Username" => "Nome de usuário",
+"Reset email send." => "Email de redefinição de senha enviado.",
+"Request failed!" => "A requisição falhou!",
+"Username" => "Nome de Usuário",
"Request reset" => "Pedir redefinição",
"Your password was reset" => "Sua senha foi redefinida",
"To login page" => "Para a página de login",
@@ -99,7 +99,7 @@
"Reset password" => "Redefinir senha",
"Personal" => "Pessoal",
"Users" => "Usuários",
-"Apps" => "Aplicações",
+"Apps" => "Apps",
"Admin" => "Admin",
"Help" => "Ajuda",
"Access forbidden" => "Acesso proibido",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 0b2af90d1d..67d43e372a 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Tipo de objecto não fornecido",
"%s ID not provided." => "ID %s não fornecido",
"Error adding %s to favorites." => "Erro a adicionar %s aos favoritos",
-"No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.",
+"No categories selected for deletion." => "Nenhuma categoria seleccionada para apagar",
"Error removing %s from favorites." => "Erro a remover %s dos favoritos.",
"Sunday" => "Domingo",
"Monday" => "Segunda",
@@ -30,11 +30,11 @@
"October" => "Outubro",
"November" => "Novembro",
"December" => "Dezembro",
-"Settings" => "Configurações",
+"Settings" => "Definições",
"seconds ago" => "Minutos atrás",
"1 minute ago" => "Há 1 minuto",
"{minutes} minutes ago" => "{minutes} minutos atrás",
-"1 hour ago" => "Há 1 horas",
+"1 hour ago" => "Há 1 hora",
"{hours} hours ago" => "Há {hours} horas atrás",
"today" => "hoje",
"yesterday" => "ontem",
@@ -63,7 +63,7 @@
"Share with" => "Partilhar com",
"Share with link" => "Partilhar com link",
"Password protect" => "Proteger com palavra-passe",
-"Password" => "Password",
+"Password" => "Palavra chave",
"Email link to person" => "Enviar o link por e-mail",
"Send" => "Enviar",
"Set expiration date" => "Especificar data de expiração",
@@ -89,11 +89,13 @@
"ownCloud password reset" => "Reposição da password ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
-"Username" => "Nome de utilizador",
+"Reset email send." => "E-mail de reinicialização enviado.",
+"Request failed!" => "O pedido falhou!",
+"Username" => "Utilizador",
"Request reset" => "Pedir reposição",
"Your password was reset" => "A sua password foi reposta",
"To login page" => "Para a página de entrada",
-"New password" => "Nova palavra-chave",
+"New password" => "Nova password",
"Reset password" => "Repor password",
"Personal" => "Pessoal",
"Users" => "Utilizadores",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 36ee8ab4b6..51c1523d7e 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -5,7 +5,6 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat dosarul \"%s\" cu tine. Îl poți descărca de aici: %s ",
"Category type not provided." => "Tipul de categorie nu este prevazut",
"No category to add?" => "Nici o categorie de adăugat?",
-"This category already exists: %s" => "Această categorie deja există: %s",
"Object type not provided." => "Tipul obiectului nu este prevazut",
"%s ID not provided." => "ID-ul %s nu a fost introdus",
"Error adding %s to favorites." => "Eroare la adăugarea %s la favorite",
@@ -30,7 +29,7 @@
"October" => "Octombrie",
"November" => "Noiembrie",
"December" => "Decembrie",
-"Settings" => "Setări",
+"Settings" => "Configurări",
"seconds ago" => "secunde în urmă",
"1 minute ago" => "1 minut în urmă",
"{minutes} minutes ago" => "{minutes} minute in urma",
@@ -53,7 +52,6 @@
"Error" => "Eroare",
"The app name is not specified." => "Numele aplicației nu a fost specificat",
"The required file {file} is not installed!" => "Fișierul obligatoriu {file} nu este instalat!",
-"Shared" => "Partajat",
"Share" => "Partajează",
"Error while sharing" => "Eroare la partajare",
"Error while unsharing" => "Eroare la anularea partajării",
@@ -63,7 +61,7 @@
"Share with" => "Partajat cu",
"Share with link" => "Partajare cu legătură",
"Password protect" => "Protejare cu parolă",
-"Password" => "Parolă",
+"Password" => "Parola",
"Email link to person" => "Expediază legătura prin poșta electronică",
"Send" => "Expediază",
"Set expiration date" => "Specifică data expirării",
@@ -84,14 +82,12 @@
"Error setting expiration date" => "Eroare la specificarea datei de expirare",
"Sending ..." => "Se expediază...",
"Email sent" => "Mesajul a fost expediat",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Modernizare reusita! Vei fii redirectionat!",
"ownCloud password reset" => "Resetarea parolei ownCloud ",
"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?",
"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
-"Username" => "Nume utilizator",
+"Reset email send." => "Resetarea emailu-lui trimisa.",
+"Request failed!" => "Solicitarea nu a reusit",
+"Username" => "Utilizator",
"Request reset" => "Cerere trimisă",
"Your password was reset" => "Parola a fost resetată",
"To login page" => "Spre pagina de autentificare",
@@ -100,19 +96,15 @@
"Personal" => "Personal",
"Users" => "Utilizatori",
"Apps" => "Aplicații",
-"Admin" => "Admin",
+"Admin" => "Administrator",
"Help" => "Ajutor",
"Access forbidden" => "Acces interzis",
"Cloud not found" => "Nu s-a găsit",
-"Edit categories" => "Editează categorii",
+"Edit categories" => "Editează categoriile",
"Add" => "Adaugă",
"Security Warning" => "Avertisment de securitate",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabil la acest atac un octet null (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Vă rugăm să actualizați instalarea dvs. PHP pentru a utiliza ownCloud in siguranță.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul de date și fișiere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcționează.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>.",
"Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
"Advanced" => "Avansat",
"Data folder" => "Director date",
@@ -132,7 +124,6 @@
"Lost your password?" => "Ai uitat parola?",
"remember" => "amintește",
"Log in" => "Autentificare",
-"Alternative Logins" => "Conectări alternative",
"prev" => "precedentul",
"next" => "următorul",
"Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 54a0b94ec9..0625a5d11d 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -30,7 +30,7 @@
"October" => "ОктÑбрь",
"November" => "ÐоÑбрь",
"December" => "Декабрь",
-"Settings" => "КонфигурациÑ",
+"Settings" => "ÐаÑтройки",
"seconds ago" => "неÑколько Ñекунд назад",
"1 minute ago" => "1 минуту назад",
"{minutes} minutes ago" => "{minutes} минут назад",
@@ -45,7 +45,7 @@
"last year" => "в прошлом году",
"years ago" => "неÑколько лет назад",
"Ok" => "Ок",
-"Cancel" => "Отменить",
+"Cancel" => "Отмена",
"Choose" => "Выбрать",
"Yes" => "Да",
"No" => "Ðет",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло уÑпешно. ПеренаправлÑемÑÑ Ð² Ваш ownCloud...",
"ownCloud password reset" => "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ",
"Use the following link to reset your password: {link}" => "ИÑпользуйте Ñледующую ÑÑылку чтобы ÑброÑить пароль: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "СÑылка Ð´Ð»Ñ ÑброÑа Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð±Ñ‹Ð»Ð° отправлена ​​по Ñлектронной почте. <br> ЕÑли вы не получите его в пределах одной двух минут, проверьте папку Ñпам. <br> ЕÑли Ñто не возможно, обратитеÑÑŒ к Вашему админиÑтратору.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Что-то не так. Ð’Ñ‹ уверены что Email / Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ñ‹ верно?",
"You will receive a link to reset your password via Email." => "Ðа ваш Ð°Ð´Ñ€ÐµÑ Email выÑлана ÑÑылка Ð´Ð»Ñ ÑброÑа паролÑ.",
+"Reset email send." => "Отправка пиÑьма Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ Ð´Ð»Ñ ÑброÑа.",
+"Request failed!" => "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ!",
"Username" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
"Request reset" => "ЗапроÑить ÑброÑ",
"Your password was reset" => "Ваш пароль был Ñброшен",
@@ -100,11 +100,11 @@
"Personal" => "Личное",
"Users" => "Пользователи",
"Apps" => "ПриложениÑ",
-"Admin" => "Admin",
+"Admin" => "ÐдминиÑтратор",
"Help" => "Помощь",
"Access forbidden" => "ДоÑтуп запрещён",
"Cloud not found" => "Облако не найдено",
-"Edit categories" => "Редактировать категрии",
+"Edit categories" => "Редактировать категории",
"Add" => "Добавить",
"Security Warning" => "Предупреждение безопаÑноÑти",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша верÑÐ¸Ñ PHP уÑзвима к атаке NULL Byte (CVE-2006-7243)",
@@ -124,7 +124,7 @@
"Database tablespace" => "Табличое проÑтранÑтво базы данных",
"Database host" => "ХоÑÑ‚ базы данных",
"Finish setup" => "Завершить уÑтановку",
-"web services under your control" => "веб-ÑервиÑÑ‹ под вашим управлением",
+"web services under your control" => "Сетевые Ñлужбы под твоим контролем",
"Log out" => "Выйти",
"Automatic logon rejected!" => "ÐвтоматичеÑкий вход в ÑиÑтему отключен!",
"If you did not change your password recently, your account may be compromised!" => "ЕÑли Ð’Ñ‹ недавно не менÑли Ñвой пароль, то Ваша ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ может быть Ñкомпрометирована!",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 8fb568aee7..1afb9e20c9 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,3 +1,137 @@
<?php $TRANSLATIONS = array(
-"Settings" => "ÐаÑтройки"
+"User %s shared a file with you" => "Пользователь %s открыл Вам доÑтуп к файлу",
+"User %s shared a folder with you" => "Пользователь %s открыл Вам доÑтуп к папке",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доÑтуп к файлу \"%s\". Он доÑтупен Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ здеÑÑŒ: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доÑтуп к папке \"%s\". Она доÑтупена Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ здеÑÑŒ: %s",
+"Category type not provided." => "Тип категории не предоÑтавлен.",
+"No category to add?" => "Ðет категории Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ?",
+"This category already exists: %s" => "Ðта ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÑƒÐ¶Ðµ ÑущеÑтвует: %s",
+"Object type not provided." => "Тип объекта не предоÑтавлен.",
+"%s ID not provided." => "%s ID не предоÑтавлен.",
+"Error adding %s to favorites." => "Ошибка Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s в избранное.",
+"No categories selected for deletion." => "Ðет категорий, выбранных Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.",
+"Error removing %s from favorites." => "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s из избранного.",
+"Sunday" => "ВоÑкреÑенье",
+"Monday" => "Понедельник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Среда",
+"Thursday" => "Четверг",
+"Friday" => "ПÑтница",
+"Saturday" => "Суббота",
+"January" => "Январь",
+"February" => "Февраль",
+"March" => "Март",
+"April" => "Ðпрель",
+"May" => "Май",
+"June" => "Июнь",
+"July" => "Июль",
+"August" => "ÐвгуÑÑ‚",
+"September" => "СентÑбрь",
+"October" => "ОктÑбрь",
+"November" => "ÐоÑбрь",
+"December" => "Декабрь",
+"Settings" => "ÐаÑтройки",
+"seconds ago" => "Ñекунд назад",
+"1 minute ago" => " 1 минуту назад",
+"{minutes} minutes ago" => "{минуты} минут назад",
+"1 hour ago" => "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´",
+"{hours} hours ago" => "{чаÑÑ‹} чаÑов назад",
+"today" => "ÑегоднÑ",
+"yesterday" => "вчера",
+"{days} days ago" => "{дни} дней назад",
+"last month" => "в прошлом меÑÑце",
+"{months} months ago" => "{меÑÑцы} меÑÑцев назад",
+"months ago" => "меÑÑц назад",
+"last year" => "в прошлом году",
+"years ago" => "лет назад",
+"Ok" => "Да",
+"Cancel" => "Отмена",
+"Choose" => "Выбрать",
+"Yes" => "Да",
+"No" => "Ðет",
+"The object type is not specified." => "Тип объекта не указан.",
+"Error" => "Ошибка",
+"The app name is not specified." => "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ указано.",
+"The required file {file} is not installed!" => "Требуемый файл {файл} не уÑтановлен!",
+"Shared" => "Опубликовано",
+"Share" => "Сделать общим",
+"Error while sharing" => "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ доÑтупа",
+"Error while unsharing" => "Ошибка Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ доÑтупа",
+"Error while changing permissions" => "Ошибка при изменении прав доÑтупа",
+"Shared with you and the group {group} by {owner}" => "Опубликовано Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ группы {группа} {ÑобÑтвенник}",
+"Shared with you by {owner}" => "Опубликовано Ð´Ð»Ñ Ð’Ð°Ñ {ÑобÑтвенник}",
+"Share with" => "Сделать общим Ñ",
+"Share with link" => "Опубликовать Ñ ÑÑылкой",
+"Password protect" => "Защитить паролем",
+"Password" => "Пароль",
+"Email link to person" => "СÑылка на Ð°Ð´Ñ€ÐµÑ Ñлектронной почты",
+"Send" => "Отправить",
+"Set expiration date" => "УÑтановить Ñрок дейÑтвиÑ",
+"Expiration date" => "Дата иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ",
+"Share via email:" => "Сделать общедоÑтупным поÑредÑтвом email:",
+"No people found" => "Ðе найдено людей",
+"Resharing is not allowed" => "РекурÑивный общий доÑтуп не разрешен",
+"Shared in {item} with {user}" => "СовмеÑтное иÑпользование в {объект} Ñ {пользователь}",
+"Unshare" => "Отключить общий доÑтуп",
+"can edit" => "возможно редактирование",
+"access control" => "контроль доÑтупа",
+"create" => "Ñоздать",
+"update" => "обновить",
+"delete" => "удалить",
+"share" => "Ñделать общим",
+"Password protected" => "Пароль защищен",
+"Error unsetting expiration date" => "Ошибка при отключении даты иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ",
+"Error setting expiration date" => "Ошибка при уÑтановке даты иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ",
+"Sending ..." => "Отправка ...",
+"Email sent" => "ПиÑьмо отправлено",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Обновление прошло неудачно. ПожалуйÑта, Ñообщите об Ñтом результате в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло уÑпешно. Ðемедленное перенаправление Ð’Ð°Ñ Ð½Ð° ownCloud.",
+"ownCloud password reset" => "Переназначение паролÑ",
+"Use the following link to reset your password: {link}" => "ВоÑпользуйтеÑÑŒ Ñледующей ÑÑылкой Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}",
+"You will receive a link to reset your password via Email." => "Ð’Ñ‹ получите ÑÑылку Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾ Ñлектронной почте.",
+"Reset email send." => "Ð¡Ð±Ñ€Ð¾Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ email.",
+"Request failed!" => "Ðе удалоÑÑŒ выполнить запроÑ!",
+"Username" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
+"Request reset" => "Ð¡Ð±Ñ€Ð¾Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа",
+"Your password was reset" => "Ваш пароль был переуÑтановлен",
+"To login page" => "Ðа Ñтраницу входа",
+"New password" => "Ðовый пароль",
+"Reset password" => "Переназначение паролÑ",
+"Personal" => "ПерÑональный",
+"Users" => "Пользователи",
+"Apps" => "ПриложениÑ",
+"Admin" => "ÐдминиÑтратор",
+"Help" => "Помощь",
+"Access forbidden" => "ДоÑтуп запрещен",
+"Cloud not found" => "Облако не найдено",
+"Edit categories" => "Редактирование категорий",
+"Add" => "Добавить",
+"Security Warning" => "Предупреждение ÑиÑтемы безопаÑноÑти",
+"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 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ как правильно наÑтроить Ваш Ñервер, пожалйÑта заглÑните в <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документацию</a>.",
+"Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
+"Advanced" => "РаÑширенный",
+"Data folder" => "Папка данных",
+"Configure the database" => "ÐаÑтроить базу данных",
+"will be used" => "будет иÑпользоватьÑÑ",
+"Database user" => "Пользователь базы данных",
+"Database password" => "Пароль базы данных",
+"Database name" => "Ð˜Ð¼Ñ Ð±Ð°Ð·Ñ‹ данных",
+"Database tablespace" => "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑ‚ÑŒ базы данных",
+"Database host" => "Сервер базы данных",
+"Finish setup" => "Завершение наÑтройки",
+"web services under your control" => "веб-ÑервиÑÑ‹ под Вашим контролем",
+"Log out" => "Выйти",
+"Automatic logon rejected!" => "ÐвтоматичеÑкий вход в ÑиÑтему отклонен!",
+"If you did not change your password recently, your account may be compromised!" => "ЕÑли Ð’Ñ‹ недавно не менÑли пароль, Ваш аккаунт может быть подвергнут опаÑноÑти!",
+"Please change your password to secure your account again." => "ПожалуйÑта, измените пароль, чтобы защитить ваш аккаунт еще раз.",
+"Lost your password?" => "Забыли пароль?",
+"remember" => "запомнить",
+"Log in" => "Войти",
+"Alternative Logins" => "Ðльтернативные Имена",
+"prev" => "предыдущий",
+"next" => "Ñледующий",
+"Updating ownCloud to version %s, this may take a while." => "Обновление ownCloud до верÑии %s, Ñто может занÑÑ‚ÑŒ некоторое времÑ."
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index c1e8ba37ed..dc9801139a 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -16,10 +16,10 @@
"July" => "ජූලි",
"August" => "අගà·à·ƒà·Šà¶à·”",
"September" => "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š",
-"October" => "ඔක්à¶à·à¶¶à¶»",
+"October" => "ඔක්à¶à·à¶¶à¶»à·Š",
"November" => "නොවà·à¶¸à·Šà¶¶à¶»à·Š",
"December" => "දෙසà·à¶¸à·Šà¶¶à¶»à·Š",
-"Settings" => "සිටුවම්",
+"Settings" => "à·ƒà·à¶šà·ƒà·”ම්",
"seconds ago" => "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ පෙර",
"1 minute ago" => "1 මිනිà¶à·Šà¶à·”වකට පෙර",
"today" => "අද",
@@ -32,13 +32,13 @@
"Cancel" => "එපà·",
"Choose" => "à¶à·à¶»à¶±à·Šà¶±",
"Yes" => "ඔව්",
-"No" => "එපà·",
+"No" => "නà·à·„à·",
"Error" => "දà·à·‚යක්",
"Share" => "බෙද෠හද෠ගන්න",
"Share with" => "බෙදà·à¶œà¶±à·Šà¶±",
"Share with link" => "යොමුවක් මඟින් බෙදà·à¶œà¶±à·Šà¶±",
"Password protect" => "මුර පදයකින් ආරක්à·à·à¶šà¶»à¶±à·Šà¶±",
-"Password" => "මුර පදය",
+"Password" => "මුර පදය ",
"Set expiration date" => "කල් ඉකුà¶à·Š විමේ දිනය දමන්න",
"Expiration date" => "කල් ඉකුà¶à·Š විමේ දිනය",
"Share via email:" => "විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල මඟින් බෙදà·à¶œà¶±à·Šà¶±: ",
@@ -54,10 +54,11 @@
"Error setting expiration date" => "කල් ඉකුà¶à·Š දිනය ස්ථà·à¶´à¶±à¶º කිරීමේ දà·à·‚යක්",
"ownCloud password reset" => "ownCloud මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· කරන්න",
"You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· කිරීම සඳහ෠යොමුව විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ලෙන් ලà·à¶¶à·™à¶±à·” ඇà¶",
+"Request failed!" => "ඉල්ලීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’!",
"Username" => "පරිà·à·“ලක නම",
"Your password was reset" => "ඔබේ මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· කරන ලදී",
"To login page" => "පිවිසුම් පිටුවට",
-"New password" => "නව මුරපදය",
+"New password" => "නව මුර පදයක්",
"Reset password" => "මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· කරන්න",
"Personal" => "පෞද්ගලික",
"Users" => "පරිà·à·“ලකයන්",
@@ -67,7 +68,7 @@
"Access forbidden" => "ඇà¶à·”ල් වීම à¶à·„නම්",
"Cloud not found" => "සොය෠ගචනොහà·à¶š",
"Edit categories" => "ප්â€à¶»à¶·à·šà¶¯à¶ºà¶±à·Š සංස්කරණය",
-"Add" => "එකà¶à·” කරන්න",
+"Add" => "එක් කරන්න",
"Security Warning" => "ආරක්ෂක නිවේදනයක්",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිචඅහඹු සංඛ්â€à¶ºà· උà¶à·Šà¶´à·à¶¯à¶šà¶ºà¶šà·Š නොමà·à¶à·’ නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවà·à·Šâ€à¶º ටà·à¶šà¶± පහසුවෙන් සොයà·à¶œà·™à¶± ඔබගේ ගිණුම පà·à·„à·à¶»à¶œà¶ à·„à·à¶š.",
"Advanced" => "දියුණු/උසස්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index d9f124b2b4..b52c8b03c4 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -34,7 +34,7 @@
"seconds ago" => "pred sekundami",
"1 minute ago" => "pred minútou",
"{minutes} minutes ago" => "pred {minutes} minútami",
-"1 hour ago" => "Pred 1 hodinou",
+"1 hour ago" => "Pred 1 hodinou.",
"{hours} hours ago" => "Pred {hours} hodinami.",
"today" => "dnes",
"yesterday" => "vÄera",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslaný na VaÅ¡u emailovú adresu.<br>Ak ho v krátkej dobe neobdržÃte, skontrolujte si Váš kôš a prieÄinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že VaÅ¡e použÃvateľské meno a email sú správne?",
"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržÃte e-mailom.",
-"Username" => "Meno použÃvateľa",
+"Reset email send." => "Obnovovacà email bol odoslaný.",
+"Request failed!" => "Požiadavka zlyhala!",
+"Username" => "Prihlasovacie meno",
"Request reset" => "Požiadať o obnovenie",
"Your password was reset" => "Vaše heslo bolo obnovené",
"To login page" => "Na prihlasovaciu stránku",
@@ -100,11 +100,11 @@
"Personal" => "Osobné",
"Users" => "PoužÃvatelia",
"Apps" => "Aplikácie",
-"Admin" => "Administrátor",
+"Admin" => "Administrácia",
"Help" => "Pomoc",
"Access forbidden" => "PrÃstup odmietnutý",
"Cloud not found" => "Nenájdené",
-"Edit categories" => "Upraviť kategórie",
+"Edit categories" => "Úprava kategóriÃ",
"Add" => "Pridať",
"Security Warning" => "BezpeÄnostné varovanie",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
@@ -124,7 +124,7 @@
"Database tablespace" => "Tabuľkový priestor databázy",
"Database host" => "Server databázy",
"Finish setup" => "DokonÄiÅ¥ inÅ¡taláciu",
-"web services under your control" => "webové služby pod Vašou kontrolou",
+"web services under your control" => "webové služby pod vašou kontrolou",
"Log out" => "Odhlásiť",
"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš úÄet môže byÅ¥ kompromitovaný.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index db5583c610..b3cd5c353c 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -34,7 +34,7 @@
"seconds ago" => "pred nekaj sekundami",
"1 minute ago" => "pred minuto",
"{minutes} minutes ago" => "pred {minutes} minutami",
-"1 hour ago" => "Pred 1 uro",
+"1 hour ago" => "pred 1 uro",
"{hours} hours ago" => "pred {hours} urami",
"today" => "danes",
"yesterday" => "vÄeraj",
@@ -72,7 +72,7 @@
"No people found" => "Ni najdenih uporabnikov",
"Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena",
"Shared in {item} with {user}" => "V souporabi v {item} z {user}",
-"Unshare" => "PrekliÄi souporabo",
+"Unshare" => "Odstrani souporabo",
"can edit" => "lahko ureja",
"access control" => "nadzor dostopa",
"create" => "ustvari",
@@ -88,10 +88,10 @@
"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspeÅ¡no konÄana. Stran bo preusmerjena na oblak ownCloud.",
"ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud",
"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporoÄila ne prejmete v doglednem Äasu, preverite tudi mape vsiljene poÅ¡te.<br>ÄŒe ne bo niti tam, stopite v stik s skrbnikom.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-"Username" => "Uporabniško ime",
+"Reset email send." => "SporoÄilo z navodili za ponastavitev gesla je poslana na vaÅ¡ elektronski naslov.",
+"Request failed!" => "Zahteva je spodletela!",
+"Username" => "Uporabniško Ime",
"Request reset" => "Zahtevaj ponovno nastavitev",
"Your password was reset" => "Geslo je ponovno nastavljeno",
"To login page" => "Na prijavno stran",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 8769a833e1..6881d0105c 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -30,7 +30,7 @@
"October" => "Tetor",
"November" => "Nëntor",
"December" => "Dhjetor",
-"Settings" => "Parametra",
+"Settings" => "Parametrat",
"seconds ago" => "sekonda më parë",
"1 minute ago" => "1 minutë më parë",
"{minutes} minutes ago" => "{minutes} minuta më parë",
@@ -88,9 +88,9 @@
"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
"ownCloud password reset" => "Rivendosja e kodit të ownCloud-it",
"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
"You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
+"Reset email send." => "Emaili i rivendosjes u dërgua.",
+"Request failed!" => "Kërkesa dështoi!",
"Username" => "Përdoruesi",
"Request reset" => "Bëj kërkesë për rivendosjen",
"Your password was reset" => "Kodi yt u rivendos",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 2329dc49b1..b71d8cdd94 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -27,7 +27,7 @@
"October" => "Октобар",
"November" => "Ðовембар",
"December" => "Децембар",
-"Settings" => "ПоÑтавке",
+"Settings" => "Подешавања",
"seconds ago" => "пре неколико Ñекунди",
"1 minute ago" => "пре 1 минут",
"{minutes} minutes ago" => "пре {minutes} минута",
@@ -50,7 +50,7 @@
"Error" => "Грешка",
"The app name is not specified." => "Име програма није унето.",
"The required file {file} is not installed!" => "Потребна датотека {file} није инÑталирана.",
-"Share" => "Дели",
+"Share" => "Дељење",
"Error while sharing" => "Грешка у дељењу",
"Error while unsharing" => "Грешка код иÑкључења дељења",
"Error while changing permissions" => "Грешка код промене дозвола",
@@ -67,7 +67,7 @@
"No people found" => "ОÑобе ниÑу пронађене.",
"Resharing is not allowed" => "Поновно дељење није дозвољено",
"Shared in {item} with {user}" => "Подељено унутар {item} Ñа {user}",
-"Unshare" => "Укини дељење",
+"Unshare" => "Ðе дели",
"can edit" => "може да мења",
"access control" => "права приÑтупа",
"create" => "направи",
@@ -82,16 +82,18 @@
"ownCloud password reset" => "Поништавање лозинке за ownCloud",
"Use the following link to reset your password: {link}" => "Овом везом реÑетујте Ñвоју лозинку: {link}",
"You will receive a link to reset your password via Email." => "Добићете везу за реÑетовање лозинке путем е-поште.",
+"Reset email send." => "Захтев је поÑлат поштом.",
+"Request failed!" => "Захтев одбијен!",
"Username" => "КориÑничко име",
"Request reset" => "Захтевај реÑетовање",
"Your password was reset" => "Ваша лозинка је реÑетована",
"To login page" => "Ðа Ñтраницу за пријаву",
"New password" => "Ðова лозинка",
"Reset password" => "РеÑетуј лозинку",
-"Personal" => "Лично",
+"Personal" => "Лична",
"Users" => "КориÑници",
-"Apps" => "Ðпликације",
-"Admin" => "ÐдминиÑтратор",
+"Apps" => "Програми",
+"Admin" => "ÐдниниÑтрација",
"Help" => "Помоћ",
"Access forbidden" => "Забрањен приÑтуп",
"Cloud not found" => "Облак није нађен",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 238843aa17..ec3eab34e2 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -27,7 +27,7 @@
"Your password was reset" => "Vaša lozinka je resetovana",
"New password" => "Nova lozinka",
"Reset password" => "Resetuj lozinku",
-"Personal" => "LiÄno",
+"Personal" => "LiÄna",
"Users" => "Korisnici",
"Apps" => "Programi",
"Admin" => "Adninistracija",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 26bcebdf6c..553afea5f7 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -89,6 +89,8 @@
"ownCloud password reset" => "ownCloud lösenordsåterställning",
"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
+"Reset email send." => "Återställ skickad e-post.",
+"Request failed!" => "Begäran misslyckades!",
"Username" => "Användarnamn",
"Request reset" => "Begär återställning",
"Your password was reset" => "Ditt lösenord har återställts",
@@ -102,7 +104,7 @@
"Help" => "Hjälp",
"Access forbidden" => "Åtkomst förbjuden",
"Cloud not found" => "Hittade inget moln",
-"Edit categories" => "Editera kategorier",
+"Edit categories" => "Redigera kategorier",
"Add" => "Lägg till",
"Security Warning" => "Säkerhetsvarning",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
@@ -112,7 +114,7 @@
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "För information hur man korrekt konfigurera servern, var god se <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
"Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Advanced" => "Avancerad",
+"Advanced" => "Avancerat",
"Data folder" => "Datamapp",
"Configure the database" => "Konfigurera databasen",
"will be used" => "kommer att användas",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index b01f8df945..b45f38627a 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -64,10 +64,10 @@
"No people found" => "நபரà¯à®•à®³à¯ யாரà¯à®®à¯ இலà¯à®²à¯ˆ",
"Resharing is not allowed" => "மீளà¯à®ªà®•à®¿à®°à¯à®µà®¤à®±à¯à®•à¯ அனà¯à®®à®¤à®¿ இலà¯à®²à¯ˆ ",
"Shared in {item} with {user}" => "{பயனாளரà¯} உடன௠{உரà¯à®ªà¯à®ªà®Ÿà®¿} பகிரபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯",
-"Unshare" => "பகிரபà¯à®ªà®Ÿà®¾à®¤à®¤à¯",
+"Unshare" => "பகிரமà¯à®Ÿà®¿à®¯à®¾à®¤à¯",
"can edit" => "தொகà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯",
"access control" => "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà®¾à®© அணà¯à®•à®²à¯",
-"create" => "உரà¯à®µà®µà®¾à®•à¯à®•à®²à¯",
+"create" => "படைதà¯à®¤à®²à¯",
"update" => "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯",
"delete" => "நீகà¯à®•à¯à®•",
"share" => "பகிரà¯à®¤à®²à¯",
@@ -77,6 +77,8 @@
"ownCloud password reset" => "ownCloud இன௠கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைபà¯à®ªà¯",
"Use the following link to reset your password: {link}" => "உஙà¯à®•à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மீளமைகà¯à®• பினà¯à®µà®°à¯à®®à¯ இணைபà¯à®ªà¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯ : {இணைபà¯à®ªà¯}",
"You will receive a link to reset your password via Email." => "நீஙà¯à®•à®³à¯ மினà¯à®©à®žà¯à®šà®²à¯ மூலம௠உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மீளமைபà¯à®ªà®¤à®±à¯à®•à®¾à®© இணைபà¯à®ªà¯ˆ பெறà¯à®µà¯€à®°à¯à®•à®³à¯. ",
+"Reset email send." => "மினà¯à®©à¯à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ மீளமைகà¯à®•à¯à®•",
+"Request failed!" => "வேணà¯à®Ÿà¯à®•à¯‹à®³à¯ தோலà¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯!",
"Username" => "பயனாளர௠பெயரà¯",
"Request reset" => "கோரிகà¯à®•à¯ˆ மீளமைபà¯à®ªà¯",
"Your password was reset" => "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
@@ -84,9 +86,9 @@
"New password" => "பà¯à®¤à®¿à®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯",
"Reset password" => "மீளமைதà¯à®¤ கடவà¯à®šà¯à®šà¯Šà®²à¯",
"Personal" => "தனிபà¯à®ªà®Ÿà¯à®Ÿ",
-"Users" => "பயனாளரà¯",
-"Apps" => "செயலிகளà¯",
-"Admin" => "நிரà¯à®µà®¾à®•à®®à¯",
+"Users" => "பயனாளரà¯à®•à®³à¯",
+"Apps" => "பயனà¯à®ªà®¾à®Ÿà¯à®•à®³à¯",
+"Admin" => "நிரà¯à®µà®¾à®•à®¿",
"Help" => "உதவி",
"Access forbidden" => "அணà¯à®• தடை",
"Cloud not found" => "Cloud காணபà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ",
@@ -96,7 +98,7 @@
"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." => "பாதà¯à®•à®¾à®ªà¯à®ªà®¾à®© சீரறà¯à®± எணà¯à®£à®¿à®•à¯à®•à¯ˆà®¯à®¾à®© பà¯à®±à®ªà¯à®ªà®¾à®•à¯à®•à®¿ இலà¯à®²à¯ˆà®¯à¯†à®©à®¿à®©à¯, தாகà¯à®•à¯à®©à®°à®¾à®²à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைபà¯à®ªà¯ அடையாளவிலà¯à®²à¯ˆà®•à®³à¯ à®®à¯à®©à¯à®®à¯Šà®´à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கணகà¯à®•à¯ˆ கைபà¯à®ªà®±à¯à®±à®²à®¾à®®à¯.",
"Create an <strong>admin account</strong>" => "<strong> நிரà¯à®µà®¾à®• கணகà¯à®•à¯Šà®©à¯à®±à¯ˆ </strong> உரà¯à®µà®¾à®•à¯à®•à¯à®•",
-"Advanced" => "உயரà¯à®¨à¯à®¤",
+"Advanced" => "மேமà¯à®ªà®Ÿà¯à®Ÿ",
"Data folder" => "தரவ௠கோபà¯à®ªà¯à®±à¯ˆ",
"Configure the database" => "தரவà¯à®¤à¯à®¤à®³à®¤à¯à®¤à¯ˆ தகவமைகà¯à®•",
"will be used" => "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®®à¯",
@@ -106,7 +108,7 @@
"Database tablespace" => "தரவà¯à®¤à¯à®¤à®³ அடà¯à®Ÿà®µà®£à¯ˆ",
"Database host" => "தரவà¯à®¤à¯à®¤à®³ ஓமà¯à®ªà¯à®©à®°à¯",
"Finish setup" => "அமைபà¯à®ªà¯ˆ à®®à¯à®Ÿà®¿à®•à¯à®•",
-"web services under your control" => "வலைய சேவைகள௠உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ கீழ௠உளà¯à®³à®¤à¯",
+"web services under your control" => "உஙà¯à®•à®³à¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ கீழ௠இணைய சேவைகளà¯",
"Log out" => "விடà¯à®ªà®¤à®¿à®•à¯ˆ செயà¯à®•",
"Automatic logon rejected!" => "தனà¯à®©à®¿à®šà¯à®šà¯ˆà®¯à®¾à®© பà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ நிராகரிபà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!",
"If you did not change your password recently, your account may be compromised!" => "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ அணà¯à®®à¯ˆà®¯à®¿à®²à¯ மாறà¯à®±à®µà®¿à®²à¯à®²à¯ˆà®¯à®¿à®©à¯, உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கணகà¯à®•à¯ சமரசமாகிவிடà¯à®®à¯!",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 1114726434..47d4b87b17 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -49,7 +49,7 @@
"Yes" => "ตà¸à¸¥à¸‡",
"No" => "ไม่ตà¸à¸¥à¸‡",
"The object type is not specified." => "ชนิดขà¸à¸‡à¸§à¸±à¸•à¸–ุยังไม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸",
-"Error" => "ข้à¸à¸œà¸´à¸”พลาด",
+"Error" => "พบข้à¸à¸œà¸´à¸”พลาด",
"The app name is not specified." => "ชื่à¸à¸‚à¸à¸‡à¹à¸à¸›à¸¢à¸±à¸‡à¹„ม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸à¸Šà¸·à¹ˆà¸",
"The required file {file} is not installed!" => "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้à¸à¸‡à¹„ด้รับà¸à¸²à¸£à¸•à¸´à¸”ตั้งไว้à¸à¹ˆà¸à¸™ ยังไม่ได้ถูà¸à¸•à¸´à¸”ตั้ง",
"Shared" => "à¹à¸Šà¸£à¹Œà¹à¸¥à¹‰à¸§",
@@ -88,6 +88,8 @@
"ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่à¸à¹„ปนี้เพื่à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„ุณใหม่: {link}",
"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่à¸à¸à¸³à¸«à¸™à¸”รหัสผ่านใหม่ทางà¸à¸µà¹€à¸¡à¸¥à¹Œ",
+"Reset email send." => "รีเซ็ตค่าà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥",
+"Request failed!" => "คำร้à¸à¸‡à¸‚à¸à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§!",
"Username" => "ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
"Request reset" => "ขà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¹ƒà¸«à¸¡à¹ˆ",
"Your password was reset" => "รหัสผ่านขà¸à¸‡à¸„ุณถูà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§",
@@ -96,8 +98,8 @@
"Reset password" => "เปลี่ยนรหัสผ่าน",
"Personal" => "ส่วนตัว",
"Users" => "ผู้ใช้งาน",
-"Apps" => "à¹à¸à¸›à¸¯",
-"Admin" => "ผู้ดูà¹à¸¥",
+"Apps" => "Apps",
+"Admin" => "ผู้ดูà¹à¸¥à¸£à¸°à¸šà¸š",
"Help" => "ช่วยเหลืà¸",
"Access forbidden" => "à¸à¸²à¸£à¹€à¸‚้าถึงถูà¸à¸«à¸§à¸‡à¸«à¹‰à¸²à¸¡",
"Cloud not found" => "ไม่พบ Cloud",
@@ -117,7 +119,7 @@
"Database tablespace" => "พื้นที่ตารางในà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥",
"Database host" => "Database host",
"Finish setup" => "ติดตั้งเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§",
-"web services under your control" => "เว็บเซà¸à¸£à¹Œà¸§à¸´à¸ªà¸—ี่คุณควบคุมà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้",
+"web services under your control" => "web services under your control",
"Log out" => "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š",
"Automatic logon rejected!" => "à¸à¸²à¸£à¹€à¸‚้าสู่ระบบà¸à¸±à¸•à¹‚นมัติถูà¸à¸›à¸à¸´à¹€à¸ªà¸˜à¹à¸¥à¹‰à¸§",
"If you did not change your password recently, your account may be compromised!" => "หาà¸à¸„ุณยังไม่ได้เปลี่ยนรหัสผ่านขà¸à¸‡à¸„ุณเมื่à¸à¹€à¸£à¹‡à¸§à¹†à¸™à¸µà¹‰, บัà¸à¸Šà¸µà¸‚à¸à¸‡à¸„ุณà¸à¸²à¸ˆà¸–ูà¸à¸šà¸¸à¸à¸£à¸¸à¸à¹‚ดยผู้à¸à¸·à¹ˆà¸™",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 4b858e82e4..d6b25b4093 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -89,7 +89,9 @@
"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.",
-"Username" => "Kullanıcı Adı",
+"Reset email send." => "Sıfırlama epostası gönderildi.",
+"Request failed!" => "Ä°stek reddedildi!",
+"Username" => "Kullanıcı adı",
"Request reset" => "Sıfırlama iste",
"Your password was reset" => "Parolanız sıfırlandı",
"To login page" => "Giriş sayfasına git",
@@ -122,7 +124,7 @@
"Database tablespace" => "Veritabanı tablo alanı",
"Database host" => "Veritabanı sunucusu",
"Finish setup" => "Kurulumu tamamla",
-"web services under your control" => "Bilgileriniz güvenli ve şifreli",
+"web services under your control" => "kontrolünüzdeki web servisleri",
"Log out" => "Çıkış yap",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index a9e4117a61..1e86ed7d36 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -72,7 +72,7 @@
"No people found" => "Жодної людини не знайдено",
"Resharing is not allowed" => "Пере-Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð½Ðµ дозволÑєтьÑÑ",
"Shared in {item} with {user}" => "Опубліковано {item} Ð´Ð»Ñ {user}",
-"Unshare" => "Закрити доÑтуп",
+"Unshare" => "Заборонити доÑтуп",
"can edit" => "може редагувати",
"access control" => "контроль доÑтупу",
"create" => "Ñтворити",
@@ -89,6 +89,8 @@
"ownCloud password reset" => "ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ownCloud",
"Use the following link to reset your password: {link}" => "ВикориÑтовуйте наÑтупне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}",
"You will receive a link to reset your password via Email." => "Ви отримаєте поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ паролю на Ел. пошту.",
+"Reset email send." => "ЛиÑÑ‚ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾.",
+"Request failed!" => "Ðевдалий запит!",
"Username" => "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача",
"Request reset" => "Запит ÑкиданнÑ",
"Your password was reset" => "Ваш пароль був Ñкинутий",
@@ -98,7 +100,7 @@
"Personal" => "ОÑобиÑте",
"Users" => "КориÑтувачі",
"Apps" => "Додатки",
-"Admin" => "Ðдмін",
+"Admin" => "ÐдмініÑтратор",
"Help" => "Допомога",
"Access forbidden" => "ДоÑтуп заборонено",
"Cloud not found" => "Cloud не знайдено",
@@ -122,7 +124,7 @@
"Database tablespace" => "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð±Ð°Ð·Ð¸ даних",
"Database host" => "ХоÑÑ‚ бази даних",
"Finish setup" => "Завершити налаштуваннÑ",
-"web services under your control" => "підконтрольні Вам веб-ÑервіÑи",
+"web services under your control" => "веб-ÑÐµÑ€Ð²Ñ–Ñ Ð¿Ñ–Ð´ вашим контролем",
"Log out" => "Вихід",
"Automatic logon rejected!" => "Ðвтоматичний вхід в ÑиÑтему відхилений!",
"If you did not change your password recently, your account may be compromised!" => "Якщо Ви не мінÑли пароль оÑтаннім чаÑом, Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð¼Ð¾Ð¶Ðµ бути Ñкомпрометованим!",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 0b45fa6931..709a874308 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -9,7 +9,7 @@
"Object type not provided." => "Loại đối tượng không được cung cấp.",
"%s ID not provided." => "%s ID không được cung cấp.",
"Error adding %s to favorites." => "Lá»—i thêm %s và o mục yêu thÃch.",
-"No categories selected for deletion." => "Bạn chÆ°a chá»n mục để xóa",
+"No categories selected for deletion." => "Không có thể loại nà o được chá»n để xóa.",
"Error removing %s from favorites." => "Lá»—i xóa %s từ mục yêu thÃch.",
"Sunday" => "Chủ nháºt",
"Monday" => "Thứ 2",
@@ -72,7 +72,7 @@
"No people found" => "Không tìm thấy ngÆ°á»i nà o",
"Resharing is not allowed" => "Chia sẻ lại không được cho phép",
"Shared in {item} with {user}" => "Äã được chia sẽ trong {item} vá»›i {user}",
-"Unshare" => "BỠchia sẻ",
+"Unshare" => "Gỡ bỠchia sẻ",
"can edit" => "có thể chỉnh sá»a",
"access control" => "quản lý truy cáºp",
"create" => "tạo",
@@ -89,20 +89,22 @@
"ownCloud password reset" => "Khôi phục máºt khẩu Owncloud ",
"Use the following link to reset your password: {link}" => "Dùng Ä‘Æ°á»ng dẫn sau để khôi phục lại máºt khẩu : {link}",
"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại máºt khẩu.",
-"Username" => "Tên đăng nháºp",
+"Reset email send." => "Thiết láºp lại email gởi.",
+"Request failed!" => "Yêu cầu của bạn không thà nh công !",
+"Username" => "Tên ngÆ°á»i dùng",
"Request reset" => "Yêu cầu thiết láºp lại ",
"Your password was reset" => "Máºt khẩu của bạn đã được khôi phục",
"To login page" => "Trang đăng nháºp",
"New password" => "Máºt khẩu má»›i",
"Reset password" => "Khôi phục máºt khẩu",
"Personal" => "Cá nhân",
-"Users" => "NgÆ°á»i dùng",
+"Users" => "NgÆ°á»i sá» dụng",
"Apps" => "Ứng dụng",
"Admin" => "Quản trị",
"Help" => "Giúp đỡ",
"Access forbidden" => "Truy cáºp bị cấm",
"Cloud not found" => "Không tìm thấy Clound",
-"Edit categories" => "Sá»a chuyên mục",
+"Edit categories" => "Sá»a thể loại",
"Add" => "Thêm",
"Security Warning" => "Cảnh bảo bảo máºt",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toà n ! chức năng random number generator đã có sẵn ,vui lòng báºt PHP OpenSSL extension.",
@@ -120,7 +122,7 @@
"Database tablespace" => "Cơ sở dữ liệu tablespace",
"Database host" => "Database host",
"Finish setup" => "Cà i đặt hoà n tất",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
+"web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn",
"Log out" => "Äăng xuất",
"Automatic logon rejected!" => "Tá»± Ä‘á»™ng đăng nháºp đã bị từ chối !",
"If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi máºt khẩu gần đây của bạn, tà i khoản của bạn có thể gặp nguy hiểm!",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 7e98d69b64..9fbfac2eec 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -7,7 +7,7 @@
"No category to add?" => "æ²¡æœ‰åˆ†ç±»æ·»åŠ äº†?",
"This category already exists: %s" => "æ¤åˆ†ç±»å·²å˜åœ¨ï¼š%s",
"Object type not provided." => "未选择对象类型。",
-"No categories selected for deletion." => "没有选ä¸è¦åˆ 除的分类。",
+"No categories selected for deletion." => "没有选者è¦åˆ 除的分类.",
"Sunday" => "星期天",
"Monday" => "星期一",
"Tuesday" => "星期二",
@@ -47,7 +47,7 @@
"Yes" => "是",
"No" => "å¦",
"The object type is not specified." => "未指定对象类型。",
-"Error" => "出错",
+"Error" => "错误",
"The app name is not specified." => "未指定应用å称。",
"The required file {file} is not installed!" => "未安装所需è¦çš„文件 {file} ï¼",
"Shared" => "已分享",
@@ -86,16 +86,18 @@
"ownCloud password reset" => "ç§æœ‰äº‘密ç é‡ç½®",
"Use the following link to reset your password: {link}" => "使用下é¢çš„链接æ¥é‡ç½®ä½ 的密ç :{link}",
"You will receive a link to reset your password via Email." => "ä½ å°†ä¼šæ”¶åˆ°ä¸€ä¸ªé‡ç½®å¯†ç 的链接",
+"Reset email send." => "é‡ç½®é‚®ä»¶å·²å‘é€ã€‚",
+"Request failed!" => "请求失败ï¼",
"Username" => "用户å",
"Request reset" => "è¦æ±‚é‡ç½®",
"Your password was reset" => "ä½ çš„å¯†ç å·²ç»è¢«é‡ç½®äº†",
"To login page" => "转至登陆页é¢",
"New password" => "新密ç ",
"Reset password" => "é‡ç½®å¯†ç ",
-"Personal" => "ç§äºº",
+"Personal" => "个人的",
"Users" => "用户",
-"Apps" => "程åº",
-"Admin" => "管ç†å‘˜",
+"Apps" => "应用程åº",
+"Admin" => "管ç†",
"Help" => "帮助",
"Access forbidden" => "ç¦æ¢è®¿é—®",
"Cloud not found" => "云 没有被找到",
@@ -118,7 +120,7 @@
"Database tablespace" => "æ•°æ®åº“è¡¨æ ¼ç©ºé—´",
"Database host" => "æ•°æ®åº“主机",
"Finish setup" => "完æˆå®‰è£…",
-"web services under your control" => "您控制的网络æœåŠ¡",
+"web services under your control" => "ä½ æŽ§åˆ¶ä¸‹çš„ç½‘ç»œæœåŠ¡",
"Log out" => "注销",
"Automatic logon rejected!" => "自动登录被拒ç»ï¼",
"If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密ç ，那您的å¸å·å¯èƒ½è¢«æ”»å‡»äº†ï¼",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 49cd1e2ebf..926d4691ed 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -54,13 +54,13 @@
"The app name is not specified." => "未指定Appå称。",
"The required file {file} is not installed!" => "所需文件{file}未安装ï¼",
"Shared" => "已共享",
-"Share" => "分享",
+"Share" => "共享",
"Error while sharing" => "共享时出错",
"Error while unsharing" => "å–消共享时出错",
"Error while changing permissions" => "修改æƒé™æ—¶å‡ºé”™",
"Shared with you and the group {group} by {owner}" => "{owner}共享给您åŠ{group}组",
"Shared with you by {owner}" => " {owner}与您共享",
-"Share with" => "分享之",
+"Share with" => "共享",
"Share with link" => "共享链接",
"Password protect" => "密ç ä¿æŠ¤",
"Password" => "密ç ",
@@ -89,6 +89,8 @@
"ownCloud password reset" => "é‡ç½® ownCloud 密ç ",
"Use the following link to reset your password: {link}" => "使用以下链接é‡ç½®æ‚¨çš„密ç ：{link}",
"You will receive a link to reset your password via Email." => "您将会收到包å«å¯ä»¥é‡ç½®å¯†ç 链接的邮件。",
+"Reset email send." => "é‡ç½®é‚®ä»¶å·²å‘é€ã€‚",
+"Request failed!" => "请求失败ï¼",
"Username" => "用户å",
"Request reset" => "请求é‡ç½®",
"Your password was reset" => "您的密ç å·²é‡ç½®",
@@ -98,12 +100,12 @@
"Personal" => "个人",
"Users" => "用户",
"Apps" => "应用",
-"Admin" => "管ç†",
+"Admin" => "管ç†å‘˜",
"Help" => "帮助",
"Access forbidden" => "访问ç¦æ¢",
"Cloud not found" => "未找到云",
"Edit categories" => "编辑分类",
-"Add" => "å¢žåŠ ",
+"Add" => "æ·»åŠ ",
"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." => "没有安全éšæœºç 生æˆå™¨ï¼Œæ”»å‡»è€…å¯èƒ½ä¼šçŒœæµ‹å¯†ç é‡ç½®ä¿¡æ¯ä»Žè€Œçªƒå–您的账户",
@@ -120,7 +122,7 @@
"Database tablespace" => "æ•°æ®åº“表空间",
"Database host" => "æ•°æ®åº“主机",
"Finish setup" => "安装完æˆ",
-"web services under your control" => "您控制的webæœåŠ¡",
+"web services under your control" => "由您掌控的网络æœåŠ¡",
"Log out" => "注销",
"Automatic logon rejected!" => "自动登录被拒ç»ï¼",
"If you did not change your password recently, your account may be compromised!" => "如果您没有最近修改您的密ç ，您的å¸æˆ·å¯èƒ½ä¼šå—到影å“ï¼",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index c4f4009517..178ab88e5e 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -55,6 +55,8 @@
"The update was successful. Redirecting you to ownCloud now." => "æ›´æ–°æˆåŠŸ, æ£",
"Use the following link to reset your password: {link}" => "請用以下連çµé‡è¨ä½ 的密碼: {link}",
"You will receive a link to reset your password via Email." => "ä½ å°‡æ”¶åˆ°ä¸€å°é›»éƒµ",
+"Reset email send." => "é‡è¨å¯†ç¢¼éƒµä»¶å·²å‚³",
+"Request failed!" => "請求失敗",
"Username" => "用戶å稱",
"Request reset" => "é‡è¨",
"Your password was reset" => "ä½ çš„å¯†ç¢¼å·²è¢«é‡è¨",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index cfc3a9fe33..3199688be3 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -34,7 +34,7 @@
"seconds ago" => "幾秒å‰",
"1 minute ago" => "1 分é˜å‰",
"{minutes} minutes ago" => "{minutes} 分é˜å‰",
-"1 hour ago" => "1 å°æ™‚之å‰",
+"1 hour ago" => "1 個å°æ™‚å‰",
"{hours} hours ago" => "{hours} å°æ™‚å‰",
"today" => "今天",
"yesterday" => "昨天",
@@ -89,6 +89,8 @@
"ownCloud password reset" => "ownCloud 密碼é‡è¨",
"Use the following link to reset your password: {link}" => "請至以下連çµé‡è¨æ‚¨çš„密碼： {link}",
"You will receive a link to reset your password via Email." => "é‡è¨å¯†ç¢¼çš„連çµå°‡æœƒå¯„åˆ°ä½ çš„é›»å郵件信箱。",
+"Reset email send." => "é‡è¨éƒµä»¶å·²é€å‡ºã€‚",
+"Request failed!" => "請求失敗ï¼",
"Username" => "使用者å稱",
"Request reset" => "請求é‡è¨",
"Your password was reset" => "您的密碼已é‡è¨",
@@ -98,8 +100,8 @@
"Personal" => "個人",
"Users" => "使用者",
"Apps" => "應用程å¼",
-"Admin" => "管ç†",
-"Help" => "說明",
+"Admin" => "管ç†è€…",
+"Help" => "幫助",
"Access forbidden" => "å˜å–被拒",
"Cloud not found" => "未發ç¾é›²ç«¯",
"Edit categories" => "編輯分類",
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index c19c6893f1..dc9f0bc8ad 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,24 +1,17 @@
-<?php if ($_['requested']): ?>
- <div class="success"><p>
- <?php
- print_unescaped($l->t('The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .'));
- ?>
- </p></div>
-<?php else: ?>
- <form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
- <fieldset>
+<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
+ <fieldset>
+ <?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
+ <?php if ($_['requested']): ?>
+ <?php echo $l->t('Reset email send.'); ?>
+ <?php else: ?>
<?php if ($_['error']): ?>
- <div class="errors"><p>
- <?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
- </p></div>
+ <?php echo $l->t('Request failed!'); ?>
<?php endif; ?>
- <?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?>
<p class="infield">
+ <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
- <label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
- <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
</p>
- <input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
- </fieldset>
- </form>
-<?php endif; ?>
+ <input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
+ <?php endif; ?>
+ </fieldset>
+</form>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4dc4a2c759..cfe0a55194 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -32,9 +32,6 @@
<body id="<?php p($_['bodyid']);?>">
<div id="notification-container">
<div id="notification"></div>
- <?php if ($_['updateAvailable']): ?>
- <div id="update-notification" style="display: inline;"><a href="<?php print_unescaped($_['updateLink']); ?>"><?php p($l->t('%s is available. Get more information on how to update.', array($_['updateVersion']))); ?></a></div>
- <?php endif; ?>
</div>
<header><div id="header">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 70ec332856..b6589d8112 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -5,19 +5,16 @@ host = https://www.transifex.net
file_filter = <lang>/core.po
source_file = templates/core.pot
source_lang = en
-type = PO
[owncloud.files]
file_filter = <lang>/files.po
source_file = templates/files.pot
source_lang = en
-type = PO
[owncloud.settings]
file_filter = <lang>/settings.po
source_file = templates/settings.pot
source_lang = en
-type = PO
[owncloud.lib]
file_filter = <lang>/lib.po
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 75c2b8c54c..0cee119c30 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jano Barnard <translate@janobarnard.co.za>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Wagwoord"
@@ -396,27 +397,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Gebruik die volgende skakel om jou wagwoord te herstel: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Gebruikersnaam"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Herstel-versoek"
@@ -522,37 +520,37 @@ msgstr "Gevorderd"
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Stel databasis op"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "sal gebruik word"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Databasis-gebruiker"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Databasis-wagwoord"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Databasis naam"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Maak opstelling klaar"
@@ -560,42 +558,37 @@ msgstr "Maak opstelling klaar"
msgid "web services under your control"
msgstr "webdienste onder jou beheer"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Teken uit"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Jou wagwoord verloor?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "onthou"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Teken aan"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index e6549742d7..46e77a89fa 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 36aa676dfb..ad2760165a 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 661213122b..c832854e86 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 268f465228..395e310b0b 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index b98068957e..d71f287f72 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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index d21eec3f1e..b27e22d90a 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index cd9b771d47..6150500229 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 641b7e82fc..83b7447a27 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Wagwoord"
@@ -423,70 +419,82 @@ msgstr "Nuwe wagwoord"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 21d7bba975..c08ce22f8b 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 9442b987a2..487be69300 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
+# <shiningmoon25@gmail.com>, 2012.
+# <tarek.taha@gmail.com>, 2013.
+# <tarek.taha@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -158,7 +162,7 @@ msgstr "كانون الاول"
#: js/js.js:286
msgid "Settings"
-msgstr "إعدادات"
+msgstr "تعديلات"
#: js/js.js:718
msgid "seconds ago"
@@ -293,9 +297,9 @@ msgstr "شارك مع رابط"
msgid "Password protect"
msgstr "Øماية كلمة السر"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
-msgstr "كلمة المرور"
+msgstr "كلمة السر"
#: js/share.js:173
msgid "Email link to person"
@@ -396,27 +400,24 @@ msgstr "إعادة تعيين كلمة سر ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "سو٠نرسل لك بريد ÙŠØتوي على وصلة لتجديد كلمة السر."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "إسم المستخدم"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "طلب تعديل"
@@ -430,7 +431,7 @@ msgstr "الى صÙØØ© الدخول"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "كلمات سر جديدة"
+msgstr "كلمة سر جديدة"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -438,11 +439,11 @@ msgstr "تعديل كلمة السر"
#: strings.php:5
msgid "Personal"
-msgstr "شخصي"
+msgstr "خصوصيات"
#: strings.php:6
msgid "Users"
-msgstr "المستخدمين"
+msgstr "المستخدم"
#: strings.php:7
msgid "Apps"
@@ -450,7 +451,7 @@ msgstr "التطبيقات"
#: strings.php:8
msgid "Admin"
-msgstr "المدير"
+msgstr "مستخدم رئيسي"
#: strings.php:9
msgid "Help"
@@ -470,7 +471,7 @@ msgstr "عدل الÙئات"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "اضÙ"
+msgstr "أدخل"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -516,86 +517,81 @@ msgstr "أض٠</strong>مستخدم رئيسي <strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr "تعديلات متقدمه"
+msgstr "خيارات متقدمة"
#: templates/installation.php:64
msgid "Data folder"
msgstr "مجلد المعلومات"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "أسس قاعدة البيانات"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "سيتم استخدمه"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "مستخدم قاعدة البيانات"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "كلمة سر مستخدم قاعدة البيانات"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "إسم قاعدة البيانات"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "مساØØ© جدول قاعدة البيانات"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "خادم قاعدة البيانات"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "انهاء التعديلات"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "خدمات الشبكة تØت سيطرتك"
+msgstr "خدمات الوب تØت تصرÙÙƒ"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "الخروج"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "تم رÙض تسجيل الدخول التلقائي!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "قد يكون Øسابك ÙÙŠ خطر إن لم تقم بإعادة تعيين كلمة السر Øديثاً"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "الرجاء إعادة تعيين كلمة السر لتأمين Øسابك."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "هل نسيت كلمة السر؟"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "تذكر"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "أدخل"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "اسماء دخول بديلة"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 11080e1536..56662a6ad7 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
+# <tarek.taha@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +80,15 @@ msgstr "مسار غير صØÙŠØ."
msgid "Files"
msgstr "الملÙات"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "شارك"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Øذ٠بشكل دائم"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "إلغاء"
+msgstr "Ù…ØذوÙ"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "إعادة تسميه"
@@ -193,7 +191,7 @@ msgstr "خطأ"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "اسم"
+msgstr "الاسم"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -221,7 +219,7 @@ msgstr "{count} ملÙات"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "رÙع"
+msgstr "إرÙع"
#: templates/admin.php:5
msgid "File handling"
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index cde78c5cd1..8ebdd5b0b9 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <hussein-atef@hotmail.com>, 2012.
+# Raed Chammem <shemada@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 6ba8fd6540..3a0cbd3949 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
@@ -104,7 +97,7 @@ msgstr "المستخدمين"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr "إلغاء"
+msgstr "ØØ°Ù"
#: templates/settings.php:129
msgid "Enable User External Storage"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 58288103c1..909d047e14 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <shiningmoon25@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 7687fcb555..be9ba85169 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <tarek.taha@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 58b505fc60..0ef6f3e755 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <shiningmoon25@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index c05edd40e0..eef5380b76 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Matalqah <houfa2005@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +28,7 @@ msgstr "شخصي"
#: app.php:373
msgid "Settings"
-msgstr "إعدادات"
+msgstr "تعديلات"
#: app.php:385
msgid "Users"
@@ -113,72 +114,72 @@ msgstr "%s لا ÙŠØ³Ù…Ø Ù„Ùƒ باستخدام نقطه (.) ÙÙŠ اسم قاعد
msgid "%s set the database host."
msgstr "%s ادخل اسم خادم قاعدة البيانات"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صØÙŠØØ©"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "انت بØاجة لكتابة اسم مستخدم موجود أو Øساب المدير."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام Oracle غير صØÙŠØ"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام MySQL غير صØÙŠØ"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "خطأ ÙÙŠ قواعد البيانات : \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "الأمر المخال٠كان : \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "أسم المستخدم '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "اØذ٠اسم المستخدم هذا من الـ MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "أسم المستخدم '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "اØذ٠اسم المستخدم هذا من الـ MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "الأمر المخال٠كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام MS SQL غير صØÙŠØ : %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اعدادات خادمك غير صØÙŠØØ© بشكل ØªØ³Ù…Ø Ù„Ùƒ بمزامنة ملÙاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "الرجاء التØقق من <a href='%s'>دليل التنصيب</a>."
@@ -235,6 +236,19 @@ msgstr "السنةالماضية"
msgid "years ago"
msgstr "سنة مضت"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s Ù…ØªØ§Ø . اØصل على <a href=\"%s\">المزيد من المعلومات </a>"
+
+#: 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\""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 4f9b7f9cb4..125a752041 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
+# <icewind1991@gmail.com>, 2012.
+# Raed Chammem <shemada@gmail.com>, 2013.
+# <shiningmoon25@gmail.com>, 2012.
+# <tarek.taha@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +26,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ùشل تØميل القائمة من الآب ستور"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "لم يتم التأكد من الشخصية بنجاØ"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "تعذر تغيير اسم الØساب"
@@ -68,7 +69,7 @@ msgstr "تم تغيير اللغة"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "طلب غير Ù…Ùهوم"
+msgstr "طلبك غير Ù…Ùهوم"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,9 +121,9 @@ msgstr "Øصل خطأ أثناء تØديث التطبيق"
msgid "Updated"
msgstr "تم التØديث بنجاØ"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "جاري الØÙظ..."
+msgstr "ØÙظ"
#: js/users.js:43
msgid "deleted"
@@ -136,18 +137,18 @@ msgstr "تراجع"
msgid "Unable to remove user"
msgstr "تعذر Øذ٠المستخدم"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "مجموعات"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "إلغاء"
+msgstr "ØØ°Ù"
#: js/users.js:262
msgid "add group"
@@ -165,7 +166,7 @@ msgstr "Øصل خطأ اثناء انشاء مستخدم"
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صØÙŠØØ©"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -316,19 +317,19 @@ msgstr "سجل"
msgid "Log level"
msgstr "مستوى السجل"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "المزيد"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "أقل"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +400,9 @@ msgstr "اØصل على التطبيقات لمزامنة ملÙاتك"
msgid "Show First Run Wizard again"
msgstr "ابدأ خطوات بداية التشغيل من جديد"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
-msgstr "كلمة المرور"
+msgstr "كلمات السر"
#: templates/personal.php:38
msgid "Your password was changed"
@@ -423,70 +424,82 @@ msgstr "كلمات سر جديدة"
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "اسم الØساب"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "البريد الإلكترونى"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "تم تغيير اسم Øسابك بنجاØ"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "تعذر تغيير اسم Øسابك"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "تغيير اسم الØساب"
#: templates/personal.php:70
+msgid "Email"
+msgstr "العنوان البريدي"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "عنوانك البريدي"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "أدخل عنوانك البريدي لتÙعيل استرجاع كلمة المرور"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "اللغة"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "ساعد ÙÙŠ الترجمه"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud ÙÙŠ مدير الملÙات"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "اسم الدخول"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "انشئ"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "ÙˆØدة التخزين الاÙتراضية"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "غير Ù…Øدود"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "شيء آخر"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "ÙˆØدة التخزين"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "تغيير اسم الØساب"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "اعداد كلمة مرور جديدة"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "اÙتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index ede2881fa3..71c1e62994 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index b35189b41a..daa1be716a 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -3,12 +3,13 @@
# 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-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +397,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +520,37 @@ msgstr "ДаÑведчаны"
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "ЗавÑршыць ÑžÑтаноўку."
@@ -560,42 +558,37 @@ msgstr "ЗавÑршыць ÑžÑтаноўку."
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/be/files.po b/l10n/be/files.po
index a7815f9dfb..ec67242474 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index e69ef2d14d..f0897fc482 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index 142d2eff37..05c52d2475 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index 03a80d8b42..2fb3fa7b5c 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 1953d1cd3d..cd40cf486a 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_versions.po b/l10n/be/files_versions.po
index e194db5f43..a04f5ae5a2 100644
--- a/l10n/be/files_versions.po
+++ b/l10n/be/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 284f8eeb6a..13d868719d 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 9da6989831..cf37559613 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index b6630ab6f2..9ff31d5c45 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index eb67822397..73f65ac143 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <adn.adin@gmail.com>, 2011.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +77,7 @@ msgstr ""
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "ÐÑма избрани категории за изтриване"
+msgstr ""
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -82,79 +86,79 @@ msgstr ""
#: js/config.php:34
msgid "Sunday"
-msgstr "ÐеделÑ"
+msgstr ""
#: js/config.php:35
msgid "Monday"
-msgstr "Понеделник"
+msgstr ""
#: js/config.php:36
msgid "Tuesday"
-msgstr "Вторник"
+msgstr ""
#: js/config.php:37
msgid "Wednesday"
-msgstr "СрÑда"
+msgstr ""
#: js/config.php:38
msgid "Thursday"
-msgstr "Четвъртък"
+msgstr ""
#: js/config.php:39
msgid "Friday"
-msgstr "Петък"
+msgstr ""
#: js/config.php:40
msgid "Saturday"
-msgstr "Събота"
+msgstr ""
#: js/config.php:45
msgid "January"
-msgstr "Януари"
+msgstr ""
#: js/config.php:46
msgid "February"
-msgstr "Февруари"
+msgstr ""
#: js/config.php:47
msgid "March"
-msgstr "Март"
+msgstr ""
#: js/config.php:48
msgid "April"
-msgstr "Ðприл"
+msgstr ""
#: js/config.php:49
msgid "May"
-msgstr "Май"
+msgstr ""
#: js/config.php:50
msgid "June"
-msgstr "Юни"
+msgstr ""
#: js/config.php:51
msgid "July"
-msgstr "Юли"
+msgstr ""
#: js/config.php:52
msgid "August"
-msgstr "ÐвгуÑÑ‚"
+msgstr ""
#: js/config.php:53
msgid "September"
-msgstr "Септември"
+msgstr ""
#: js/config.php:54
msgid "October"
-msgstr "Октомври"
+msgstr ""
#: js/config.php:55
msgid "November"
-msgstr "Ðоември"
+msgstr ""
#: js/config.php:56
msgid "December"
-msgstr "Декември"
+msgstr ""
#: js/js.js:286
msgid "Settings"
@@ -214,7 +218,7 @@ msgstr "поÑледните години"
#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
msgid "Ok"
-msgstr "Добре"
+msgstr ""
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
@@ -226,11 +230,11 @@ msgstr ""
#: js/oc-dialogs.js:215
msgid "Yes"
-msgstr "Да"
+msgstr ""
#: js/oc-dialogs.js:222
msgid "No"
-msgstr "Ðе"
+msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -283,7 +287,7 @@ msgstr ""
#: js/share.js:159
msgid "Share with"
-msgstr "Споделено Ñ"
+msgstr ""
#: js/share.js:164
msgid "Share with link"
@@ -293,7 +297,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Парола"
@@ -343,7 +347,7 @@ msgstr ""
#: js/share.js:325
msgid "create"
-msgstr "Ñъздаване"
+msgstr ""
#: js/share.js:328
msgid "update"
@@ -396,33 +400,30 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Ще получите връзка за нулиране на паролата Ви."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Потребител"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
-msgstr "Ðулиране на заÑвка"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr "Вашата парола е нулирана"
+msgstr ""
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
@@ -434,7 +435,7 @@ msgstr "Ðова парола"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
-msgstr "Ðулиране на парола"
+msgstr ""
#: strings.php:5
msgid "Personal"
@@ -458,15 +459,15 @@ msgstr "Помощ"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr "ДоÑтъпът е забранен"
+msgstr ""
#: templates/404.php:12
msgid "Cloud not found"
-msgstr "облакът не намерен"
+msgstr ""
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Редактиране на категориите"
+msgstr ""
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -512,100 +513,95 @@ msgstr ""
#: templates/installation.php:44
msgid "Create an <strong>admin account</strong>"
-msgstr "Създаване на <strong>админ профил</strong>"
+msgstr ""
#: templates/installation.php:62
msgid "Advanced"
-msgstr "Разширено"
+msgstr ""
#: templates/installation.php:64
msgid "Data folder"
-msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° данни"
+msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
-msgstr "Конфигуриране на базата"
+msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
-msgstr "ще Ñе ползва"
+msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
-msgstr "Потребител за базата"
+msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
-msgstr "Парола за базата"
+msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
-msgstr "Име на базата"
+msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
-msgstr "ХоÑÑ‚ за базата"
+msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
-msgstr "Завършване на наÑтройките"
+msgstr ""
#: templates/layout.guest.php:40
msgid "web services under your control"
msgstr "уеб уÑлуги под Ваш контрол"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
-msgstr "Изход"
+msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
-msgstr "Забравена парола?"
+msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
-msgstr "запомни"
+msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
-msgstr "Вход"
+msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
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/bg_BG/files.po b/l10n/bg_BG/files.po
index 6460328a0c..1e12a345fe 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011,2013.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +39,7 @@ msgstr ""
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Файлът е качен уÑпешно"
+msgstr ""
#: ajax/upload.php:27
msgid ""
@@ -48,15 +50,15 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Файлът който Ñе опитвате да качите надвишава ÑтойноÑтите в MAX_FILE_SIZE в HTML формата."
+msgstr ""
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Файлът е качен чаÑтично"
+msgstr ""
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Фахлът не бе качен"
+msgstr ""
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +80,15 @@ msgstr "Ðевалидна директориÑ."
msgid "Files"
msgstr "Файлове"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "СподелÑне"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Изтриване завинаги"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Изтриване"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Преименуване"
@@ -303,11 +301,11 @@ msgstr "Файлът който Ñте избрали за качване е п
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Файловете които Ñе опитвате да качите Ñа по-големи от позволеното за Ñървъра."
+msgstr ""
#: templates/index.php:115
msgid "Files are being scanned, please wait."
-msgstr "Файловете Ñе претърÑват, изчакайте."
+msgstr ""
#: templates/index.php:118
msgid "Current scanning"
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 859b65c0eb..5f2bd2b9f5 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 8c95fe66a3..0e80e601f2 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -37,33 +38,26 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Външно хранилище"
#: templates/settings.php:9 templates/settings.php:28
msgid "Folder name"
-msgstr "Име на папката"
+msgstr ""
#: templates/settings.php:10
msgid "External storage"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 156d054e77..18f3a9f6d7 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index a2db650ea7..cf61ec83ca 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Kiril <neohidra@gmail.com>, 2013.
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -81,4 +83,4 @@ msgstr "Изтриване"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr "Изтрити файлове"
+msgstr ""
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index d01c393db1..b88246549b 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -24,12 +25,12 @@ msgstr ""
#: history.php:40
msgid "success"
-msgstr "уÑпешно"
+msgstr ""
#: history.php:42
#, php-format
msgid "File %s was reverted to version %s"
-msgstr "Файлът %s бе върнат към верÑÐ¸Ñ %s"
+msgstr ""
#: history.php:49
msgid "failure"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 5ba599532f..0ae91bad8e 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Kiril <neohidra@gmail.com>, 2013
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +115,72 @@ msgstr "%s, не можете да ползвате точки в името н
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Ðевалидно PostgreSQL потребителÑко име и/или парола"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Ðеобходимо е да влезете в вÑъщеÑтвуващ акаунт или като админиÑтратора"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Ðевалидно Oracle потребителÑко име и/или парола"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Ðевалидно MySQL потребителÑко име и/или парола"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Грешка в базата от данни: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL потребителÑÑ‚ '%s'@'localhost' вече ÑъщеÑтвува"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Изтриване на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL потребителÑÑ‚ '%s'@'%%' вече ÑъщеÑтвува."
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Изтриване на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Ðевалидно MS SQL потребителÑко име и/или парола: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ повторна Ñправка Ñ <a href='%s'>ръководÑтвото за инÑталиране</a>."
@@ -235,6 +237,19 @@ msgstr "поÑледната година"
msgid "years ago"
msgstr "поÑледните години"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s е налична. Получете <a href=\"%s\">повече информациÑ</a>"
+
+#: 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\""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e6571146d9..c6d607a17e 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <adn.adin@gmail.com>, 2011.
+# Stefan Ilivanov <ilivanov@gmail.com>, 2011,2013.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Възникна проблем Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñта"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -48,11 +47,11 @@ msgstr ""
#: ajax/lostpassword.php:12
msgid "Email saved"
-msgstr "Email адреÑа е запиÑан"
+msgstr ""
#: ajax/lostpassword.php:14
msgid "Invalid email"
-msgstr "Ðевалиден Email адреÑ"
+msgstr ""
#: ajax/removegroup.php:13
msgid "Unable to delete group"
@@ -90,7 +89,7 @@ msgstr ""
#: js/apps.js:30
msgid "Update to {appversion}"
-msgstr "ОбновÑване до {appversion}"
+msgstr ""
#: js/apps.js:36 js/apps.js:76
msgid "Disable"
@@ -120,7 +119,7 @@ msgstr ""
msgid "Updated"
msgstr "Обновено"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "ЗапиÑване..."
@@ -136,22 +135,22 @@ msgstr "възтановÑване"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Изтриване"
#: js/users.js:262
msgid "add group"
-msgstr "нова група"
+msgstr ""
#: js/users.js:414
msgid "A valid username must be provided"
@@ -165,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -235,7 +234,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Крон"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -255,7 +254,7 @@ msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "СподелÑне"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
@@ -316,19 +315,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Още"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "По-малко"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "ВерÑиÑ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "Покажи наÑтройките за първоначално зареждане отново"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Парола"
@@ -423,70 +422,82 @@ msgstr "Ðова парола"
msgid "Change password"
msgstr "ПромÑна на паролата"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Екранно име"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Ð’Ð°ÑˆÐ¸Ñ email адреÑ"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
-msgstr "Въведете е-поща за възÑтановÑване на паролата"
+msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Език"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Помогнете Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð°"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Потребител"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Създаване"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Хранилище по подразбиране"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ðеограничено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Други"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 0c18cd6603..8ec4f3ffdb 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 59b3c25b06..47cccfcd63 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <paul_shubhra@yahoo.com>, 2013.
+# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +75,7 @@ msgstr "পà§à¦°à¦¿à§Ÿà¦¤à§‡ %s যোগ করতে সমসà§à¦¯à¦¾ দ
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "মà§à¦›à§‡ ফেলার জনà§à¦¯ কনো কà§à¦¯à¦¾à¦Ÿà§‡à¦—রি নিরà§à¦¬à¦¾à¦šà¦¨ করা হয় নি।"
+msgstr "মà§à¦›à§‡ ফেলার জনà§à¦¯ কোন কà§à¦¯à¦¾à¦Ÿà§‡à¦—রি নিরà§à¦¬à¦¾à¦šà¦¨ করা হয় নি ।"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -98,7 +100,7 @@ msgstr "বà§à¦§à¦¬à¦¾à¦°"
#: js/config.php:38
msgid "Thursday"
-msgstr "বৃহসà§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
+msgstr "বৃহষà§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
#: js/config.php:39
msgid "Friday"
@@ -166,7 +168,7 @@ msgstr "সেকেনà§à¦¡ পূরà§à¦¬à§‡"
#: js/js.js:719
msgid "1 minute ago"
-msgstr "১ মিনিট পূরà§à¦¬à§‡"
+msgstr "1 মিনিট পূরà§à¦¬à§‡"
#: js/js.js:720
msgid "{minutes} minutes ago"
@@ -194,7 +196,7 @@ msgstr "{days} দিন পূরà§à¦¬à§‡"
#: js/js.js:726
msgid "last month"
-msgstr "গত মাস"
+msgstr "গতমাস"
#: js/js.js:727
msgid "{months} months ago"
@@ -293,7 +295,7 @@ msgstr "লিংকের সাথে à¦à¦¾à¦—াà¦à¦¾à¦—ি কর"
msgid "Password protect"
msgstr "কূটশবà§à¦¦ সà§à¦°à¦•à§à¦·à¦¿à¦¤"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "কূটশবà§à¦¦"
@@ -331,7 +333,7 @@ msgstr "{user} à¦à¦° সাথে {item} à¦à¦¾à¦—াà¦à¦¾à¦—ি করা হ
#: js/share.js:308
msgid "Unshare"
-msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল "
+msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল কর"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +398,24 @@ msgstr "ownCloud কূটশবà§à¦¦ পূনঃনিরà§à¦§à¦¾à¦°à¦£"
msgid "Use the following link to reset your password: {link}"
msgstr "আপনার কূটশবà§à¦¦à¦Ÿà¦¿ পূনঃনিরà§à¦§à¦¾à¦°à¦£ করার জনà§à¦¯ নিমà§à¦¨à§‹à¦•à§à¦¤ লিংকটি বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨à¦ƒ {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "কূটশবà§à¦¦ পূনঃনিরà§à¦§à¦¾à¦°à¦£à§‡à¦° জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ টূনঃনিরà§à¦§à¦¾à¦°à¦£ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "অনà§à¦°à§‹à¦§ পূনঃনিরà§à¦§à¦¾à¦°à¦£"
@@ -446,7 +445,7 @@ msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
#: strings.php:7
msgid "Apps"
-msgstr "অà§à¦¯à¦¾à¦ª"
+msgstr "অà§à¦¯à¦¾à¦ªà¦¸"
#: strings.php:8
msgid "Admin"
@@ -522,80 +521,75 @@ msgstr "সà§à¦šà¦¾à¦°à§"
msgid "Data folder"
msgstr "ডাটা ফোলà§à¦¡à¦¾à¦° "
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "ডাটাবেচ কনফিগার করà§à¦¨"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "বà§à¦¯à¦¬à¦¹à§ƒà¦¤ হবে"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "ডাটাবেজ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "ডাটাবেজ কূটশবà§à¦¦"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "ডাটাবেজের নাম"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "ডাটাবেজ টেবলসà§à¦ªà§‡à¦¸"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "ডাটাবেজ হোসà§à¦Ÿ"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "সেটআপ সà§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ কর"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "ওয়েব সারà§à¦à¦¿à¦¸ আপনার হাতের মà§à¦ োয়"
+msgstr "ওয়েব সারà§à¦à¦¿à¦¸à§‡à¦° নিয়নà§à¦¤à§à¦°à¦£ আপনার হাতের মà§à¦ োয়"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "পà§à¦°à¦¸à§à¦¥à¦¾à¦¨"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "কূটশবà§à¦¦ হারিয়েছেন?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "মনে রাখ"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "পà§à¦°à¦¬à§‡à¦¶"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index e3b44fed11..9a39dab1c1 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -33,11 +34,11 @@ msgstr "ফাইলের নাম পরিবরà§à¦¤à¦¨ করা সম
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr "কোন ফাইল আপলোড করা হয় নি। সমসà§à¦¯à¦¾à¦° কারণটি অজà§à¦žà¦¾à¦¤à¥¤"
+msgstr "কোন ফাইল আপলোড করা হয় নি। সমসà§à¦¯à¦¾ অজà§à¦žà¦¾à¦¤à¥¤"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "কোন সমসà§à¦¯à¦¾ হয় নি, ফাইল আপলোড সà§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ হয়েছে।"
+msgstr "কোন সমসà§à¦¯à¦¾ নেই, ফাইল আপলোড সà§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ হয়েছে"
#: ajax/upload.php:27
msgid ""
@@ -48,7 +49,7 @@ msgstr "আপলোড করা ফাইলটি php.ini তে বরà§
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "আপলোড করা ফাইলটি HTML ফরà§à¦®à§‡ উলà§à¦²à¦¿à¦–িত MAX_FILE_SIZE নিরà§à¦§à¦¾à¦°à¦¿à¦¤ ফাইলের সরà§à¦¬à§‹à¦šà§à¦š আকার অতিকà§à¦°à¦® করতে চলেছে "
+msgstr "আপলোড করা ফাইলটি HTML ফরà§à¦®à§‡ নিরà§à¦§à¦¾à¦°à¦¿à¦¤ MAX_FILE_SIZE নিরà§à¦¦à§‡à¦¶à¦¿à¦¤ সরà§à¦¬à§‹à¦šà§à¦š আকার অতিকà§à¦°à¦® করেছে "
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -60,7 +61,7 @@ msgstr "কোন ফাইল আপলোড করা হয় নি"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "অসà§à¦¥à¦¾à§Ÿà§€ ফোলà§à¦¡à¦¾à¦°à¦Ÿà¦¿ হারানো গিয়েছে"
+msgstr "অসà§à¦¥à¦¾à§Ÿà§€ ফোলà§à¦¡à¦¾à¦° খোয়া গিয়েছে"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +79,15 @@ msgstr "à¦à§à¦² ডিরেকà§à¦Ÿà¦°à¦¿"
msgid "Files"
msgstr "ফাইল"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "মà§à¦›à§‡"
+msgstr "মà§à¦›à§‡ ফেল"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "পূনঃনামকরণ"
@@ -193,7 +190,7 @@ msgstr "সমসà§à¦¯à¦¾"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "রাম"
+msgstr "নাম"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -253,7 +250,7 @@ msgstr "ZIP ফাইলের ইনপà§à¦Ÿà§‡à¦° সরà§à¦¬à§‹à¦šà§à¦š
#: templates/admin.php:26
msgid "Save"
-msgstr "সংরকà§à¦·à¦£"
+msgstr "সংরকà§à¦·à¦¨ কর"
#: templates/index.php:7
msgid "New"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index a2ee8c0db4..0bcc04a179 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 910f1b7be0..a277faf064 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr "দয়া করে সঠিক à¦à¦¬à¦‚ বৈধ Dropbox app key and
msgid "Error configuring Google Drive storage"
msgstr "Google Drive সংরকà§à¦·à¦£à¦¾à¦—ার নিরà§à¦§à¦¾à¦°à¦£ করতে সমসà§à¦¯à¦¾ "
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "বাহà§à¦¯à¦¿à¦• সংরকà§à¦·à¦£à¦¾à¦—ার"
@@ -104,7 +97,7 @@ msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr "মà§à¦›à§‡"
+msgstr "মà§à¦›à§‡ ফেল"
#: templates/settings.php:129
msgid "Enable User External Storage"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 32181f41e1..00d132cd17 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr "কূটশবà§à¦¦"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "জমা দিন"
+msgstr "জমা দাও"
#: templates/public.php:10
#, php-format
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index effbaf5571..5327ace142 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 2edd5f1a35..72d49d3c8c 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 6ba334e04d..0509e1a16d 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "নিয়ামকসমূহ"
#: app.php:385
msgid "Users"
-msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
+msgstr "বà§à¦¯à¦à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
#: app.php:398
msgid "Apps"
@@ -39,7 +39,7 @@ msgstr "অà§à¦¯à¦¾à¦ª"
#: app.php:406
msgid "Admin"
-msgstr "পà§à¦°à¦¶à¦¾à¦¸à¦¨"
+msgstr "পà§à¦°à¦¶à¦¾à¦¸à¦•"
#: files.php:209
msgid "ZIP download is turned off."
@@ -79,7 +79,7 @@ msgstr "ফাইল"
#: search/provider/file.php:26 search/provider/file.php:33
msgid "Text"
-msgstr "টেকà§à¦¸à¦Ÿ"
+msgstr ""
#: search/provider/file.php:29
msgid "Images"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr "গত বছর"
msgid "years ago"
msgstr "বছর পূরà§à¦¬à§‡"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s à¦à¦–ন সà§à¦²à¦à¥¤ <a href=\"%s\">আরও জানà§à¦¨</a>"
+
+#: 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\""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 3a12193247..f70b3f4d8d 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "অà§à¦¯à¦¾à¦ªà¦¸à§à¦Ÿà§‹à¦° থেকে তালিকা লোড করতে সকà§à¦·à¦® নয়"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "অনà§à¦®à§‹à¦¦à¦¨ ঘটিত সমসà§à¦¯à¦¾"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -68,7 +65,7 @@ msgstr "à¦à¦¾à¦·à¦¾ পরিবরà§à¦¤à¦¨ করা হয়েছে"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "অনà§à¦°à§‹à¦§à¦Ÿà¦¿ সঠিক নয়"
+msgstr "অনà§à¦°à§‹à¦§à¦Ÿà¦¿ যথাযথ নয়"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "সংরকà§à¦·à¦£ করা হচà§à¦›à§‡.."
@@ -136,18 +133,18 @@ msgstr "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "গোষà§à¦ ীসমূহ"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "গোষà§à¦ ী পà§à¦°à¦¶à¦¾à¦¸à¦•"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "মà§à¦›à§‡"
+msgstr "মà§à¦›à§‡ ফেল"
#: js/users.js:262
msgid "add group"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -316,19 +313,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "বেশী"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "কম"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "পà§à¦°à¦¥à¦®à¦¬à¦¾à¦° চালানোর যাদà§à¦•à¦° পূনরায় পà§à¦°à¦¦à¦°à§à¦¶à¦¨ কর"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "কূটশবà§à¦¦"
@@ -423,70 +420,82 @@ msgstr "নতà§à¦¨ কূটশবà§à¦¦"
msgid "Change password"
msgstr "কূটশবà§à¦¦ পরিবরà§à¦¤à¦¨ করà§à¦¨"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "ইমেইল"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "ই-মেইল "
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "আপনার ই-মেইল ঠিকানা"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "কূটশবà§à¦¦ পূনরূদà§à¦§à¦¾à¦° সকà§à¦°à¦¿à§Ÿ করার জনà§à¦¯ ই-মেইল ঠিকানাটি পূরণ করà§à¦¨"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "à¦à¦¾à¦·à¦¾"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "অনà§à¦¬à¦¾à¦¦ করতে সহায়তা করà§à¦¨"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "আপনার ownCloud ঠসংযà§à¦•à§à¦¤ হতে à¦à¦‡ ঠিকানাটি আপনার ফাইল বà§à¦¯à¦¬à¦¸à§à¦¥à¦¾à¦ªà¦•à§‡ বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "তৈরী কর"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ সংরকà§à¦·à¦£à¦¾à¦—ার"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "অসীম"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "সংরকà§à¦·à¦£à¦¾à¦—ার"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 782011bb13..34a3a9d16c 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index c28a6d7ac1..a619724318 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <joan@montane.cat>, 2012.
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2011-2013.
+# <sacoo2@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -158,7 +162,7 @@ msgstr "Desembre"
#: js/js.js:286
msgid "Settings"
-msgstr "Configuració"
+msgstr "Arranjament"
#: js/js.js:718
msgid "seconds ago"
@@ -293,7 +297,7 @@ msgstr "Comparteix amb enllaç"
msgid "Password protect"
msgstr "Protegir amb contrasenya"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Contrasenya"
@@ -396,27 +400,24 @@ msgstr "estableix de nou la contrasenya Owncloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Useu l'enllaç següent per restablir la contrasenya: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "S'ha enviat el correu reinicialització"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "El requeriment ha fallat!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nom d'usuari"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Sol·licita reinicialització"
@@ -450,7 +451,7 @@ msgstr "Aplicacions"
#: strings.php:8
msgid "Admin"
-msgstr "Administració"
+msgstr "Administrador"
#: strings.php:9
msgid "Help"
@@ -522,37 +523,37 @@ msgstr "Avançat"
msgid "Data folder"
msgstr "Carpeta de dades"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configura la base de dades"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "s'usarà "
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Usuari de la base de dades"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Contrasenya de la base de dades"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nom de la base de dades"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Espai de taula de la base de dades"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Ordinador central de la base de dades"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Acaba la configuració"
@@ -560,42 +561,37 @@ msgstr "Acaba la configuració"
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Surt"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "L'ha rebutjat l'acceditació automà tica!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Heu perdut la contrasenya?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "recorda'm"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Inici de sessió"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Acreditacions alternatives"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 52940b62b9..ae6109e30f 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bury1000@gmail.com>, 2012.
+# <joan@montane.cat>, 2012.
+# <josep_tomas@hotmail.com>, 2012.
+# Josep Tomàs <jtomas.binsoft@gmail.com>, 2012.
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2011-2013.
+# <sacoo2@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +44,7 @@ msgstr "No s'ha carregat cap fitxer. Error desconegut"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
+msgstr "El fitxer s'ha pujat correctament"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +55,19 @@ msgstr "L’arxiu que voleu carregar supera el mà xim definit en la directiva up
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
+msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "El fitxer només s'ha carregat parcialment"
+msgstr "El fitxer només s'ha pujat parcialment"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "No s'ha carregat cap fitxer"
+msgstr "El fitxer no s'ha pujat"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Falta un fitxer temporal"
+msgstr "S'ha perdut un fitxer temporal"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +85,21 @@ msgstr "Directori no và lid."
msgid "Files"
msgstr "Fitxers"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Comparteix"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Esborra permanentment"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "Esborra"
+msgstr "Suprimeix"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Reanomena"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "Pendent"
+msgstr "Pendents"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -257,7 +260,7 @@ msgstr "Desa"
#: templates/index.php:7
msgid "New"
-msgstr "Nova"
+msgstr "Nou"
#: templates/index.php:10
msgid "Text file"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index b01e6a02da..951708dd52 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "Exclou els tipus de fitxers següents de l'encriptatge:"
#: templates/settings.php:12
msgid "None"
-msgstr "cap"
+msgstr "Cap"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index d1006bfb00..bd05bbeecc 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "Proporcioneu una clau d'aplicació i secret và lids per a Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Error en configurar l'emmagatzemament Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>AvÃs:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>AvÃs:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Emmagatzemament extern"
@@ -104,7 +99,7 @@ msgstr "Usuaris"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr "Esborra"
+msgstr "Elimina"
#: templates/settings.php:129
msgid "Enable User External Storage"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index d23fa03363..d4394d00f7 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rcalvoi@yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index b91a1a13b3..e06aadb4b6 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rcalvoi@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 624a5da1e1..9b325d0966 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <josep_tomas@hotmail.com>, 2012.
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 9225ebad50..29f4a9f8ac 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc <rcalvoi@yahoo.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +115,72 @@ msgstr "%s no podeu usar punts en el nom de la base de dades"
msgid "%s set the database host."
msgstr "%s establiu l'ordinador central de la base de dades."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya PostgreSQL no và lids"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Heu d'escriure un compte existent o el d'administrador."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya Oracle no và lids"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya MySQL no và lids"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "L'ordre en conflicte és: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Elimina aquest usuari de MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Elimina aquest usuari de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nom d'usuari i/o contrasenya MS SQL no và lids: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfÃcie WebDAV sembla no funcionar correctament."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
@@ -233,7 +235,20 @@ msgstr "l'any passat"
#: template.php:124
msgid "years ago"
-msgstr "anys enrere"
+msgstr "fa anys"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s està disponible. Obtén <a href=\"%s\">més informació</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "actualitzat"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "la comprovació d'actualitzacions està desactivada"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 5807e4d9aa..57ef354d7c 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bury1000@gmail.com>, 2012.
+# <joan@montane.cat>, 2012.
+# <josep_tomas@hotmail.com>, 2012.
+# Josep Tomàs <jtomas.binsoft@gmail.com>, 2012.
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +27,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "No s'ha pogut carregar la llista des de l'App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Error d'autenticació"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "No s'ha pogut canviar el nom a mostrar"
@@ -68,7 +70,7 @@ msgstr "S'ha canviat l'idioma"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Sol·licitud no và lida"
+msgstr "Sol.licitud no và lida"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -98,7 +100,7 @@ msgstr "Desactiva"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Habilita"
+msgstr "Activa"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,9 +122,9 @@ msgstr "Error en actualitzar l'aplicació"
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Desant..."
+msgstr "S'està desant..."
#: js/users.js:43
msgid "deleted"
@@ -136,18 +138,18 @@ msgstr "desfés"
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grups"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "Esborra"
+msgstr "Suprimeix"
#: js/users.js:262
msgid "add group"
@@ -165,7 +167,7 @@ msgstr "Error en crear l'usuari"
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya và lida"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Català "
@@ -316,19 +318,19 @@ msgstr "Registre"
msgid "Log level"
msgstr "Nivell de registre"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Més"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menys"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versió"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +401,7 @@ msgstr "Obtén les aplicacions per sincronitzar fitxers"
msgid "Show First Run Wizard again"
msgstr "Torna a mostrar l'assistent de primera execució"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Contrasenya"
@@ -423,70 +425,82 @@ msgstr "Contrasenya nova"
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nom a mostrar"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "El vostre nom a mostrar ha canviat"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "No s'ha pogut canviar el vostre nom a mostrar"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Canvia el nom a mostrar"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Correu electrònic"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Correu electrònic"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nom d'accés"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Emmagatzemament per defecte"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Il·limitat"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Un altre"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Emmagatzemament"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "canvia el nom a mostrar"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "estableix nova contrasenya"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 91d2f5617c..bf2d7adf14 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rcalvoi@yahoo.com>, 2013.
+# <rcalvoi@yahoo.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -92,7 +94,7 @@ msgstr "Afegeix la configuració del servidor"
#: templates/settings.php:36
msgid "Host"
-msgstr "Equip remot"
+msgstr "MÃ quina"
#: templates/settings.php:38
msgid ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 76830c0950..0db794fe6c 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -3,14 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
+# Jan Krejci <krejca85@gmail.com>, 2011
+# Martin <fireball@atlas.cz>, 2011-2012
+# Michal Hrušecký <Michal@hrusecky.net>, 2012
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 11:21+0000\n"
+"Last-Translator: cernydav <info@senman.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +198,7 @@ msgstr "před {days} dny"
#: js/js.js:726
msgid "last month"
-msgstr "minulý mÄ›sÃc"
+msgstr "minulý mesÃc"
#: js/js.js:727
msgid "{months} months ago"
@@ -372,7 +375,7 @@ msgstr "Chyba při nastavenà data vypršenà platnosti"
#: js/share.js:604
msgid "Sending ..."
-msgstr "OdesÃlám ..."
+msgstr "OdesÃlám..."
#: js/share.js:615
msgid "Email sent"
@@ -397,27 +400,24 @@ msgstr "Obnovenà hesla pro ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Heslo obnovÃte použitÃm následujÃcÃho odkazu: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Odkaz na obnovenà hesla byl odeslán na vaÅ¡i e-mailovou adresu.<br>Pokud jej v krátké dobÄ› neobdržÃte, zkontrolujte váš koÅ¡ a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Bude Vám e-mailem zaslán odkaz pro obnovu hesla."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Obnovovacà e-mail odeslán."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Požadavek selhal."
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
#: templates/login.php:19
msgid "Username"
msgstr "Uživatelské jméno"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Vyžádat obnovu"
@@ -559,14 +559,9 @@ msgstr "DokonÄit nastavenÃ"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "služby webu pod Vašà kontrolou"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "webové služby pod Vašà kontrolou"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Odhlásit se"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 4d8a59d8c7..d5d74b7b83 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2011-2012.
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -78,25 +81,21 @@ msgstr "Neplatný adresář"
msgid "Files"
msgstr "Soubory"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "SdÃlet"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Trvale odstranit"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Smazat"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Přejmenovat"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "NevyÅ™Ãzené"
+msgstr "ÄŒekajÃcÃ"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -164,7 +163,7 @@ msgstr "VaÅ¡e soubory ke staženà se pÅ™ipravujÃ. Pokud jsou velké může to
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů"
+msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů"
#: js/files.js:272
msgid "Not enough space available"
@@ -201,7 +200,7 @@ msgstr "Velikost"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "Upraveno"
+msgstr "Změněno"
#: js/files.js:893
msgid "1 folder"
@@ -297,7 +296,7 @@ msgstr "ZruÅ¡it sdÃlenÃ"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "OdesÃlaný soubor je pÅ™ÃliÅ¡ velký"
+msgstr "Odeslaný soubor je pÅ™ÃliÅ¡ velký"
#: templates/index.php:110
msgid ""
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index af7d094cfb..cf291239f3 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 62dc51cbd5..fe3dea1568 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jan Krejci <krejca85@gmail.com>, 2012.
+# Martin <fireball@atlas.cz>, 2012.
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +41,19 @@ msgstr "Zadejte, prosÃm, platný klÃÄ a bezpeÄnostnà frázi aplikace Dropbo
msgid "Error configuring Google Drive storage"
msgstr "Chyba při nastavenà úložiště Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>VarovánÃ:</b> nenà nainstalován program \"smbclient\". Nenà možné pÅ™ipojenà oddÃlů CIFS/SMB. ProsÃm požádejte svého správce systému aÅ¥ jej nainstaluje."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>VarovánÃ:</b> nenà nainstalována, nebo povolena, podpora FTP v PHP. Nenà možné pÅ™ipojenà oddÃlů FTP. ProsÃm požádejte svého správce systému aÅ¥ ji nainstaluje."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>VarovánÃ:</b> nenà nainstalována, nebo povolena, podpora Curl v PHP. Nenà možné pÅ™ipojenà oddÃlů ownCloud, WebDAV, Äi GoogleDrive. ProsÃm požádejte svého správce systému aÅ¥ ji nainstaluje."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Externà úložiště"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index b26c3b61d6..c68599b2ae 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index be29385223..48adf5d966 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 03e51b990a..1425b50698 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index ae5d9d8705..aeba218b37 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -113,83 +115,83 @@ msgstr "V názvu databáze %s nesmÃte použÃvat teÄky."
msgid "%s set the database host."
msgstr "Zadejte název poÄÃtaÄe s databázà %s."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Uživatelské jméno, Äi heslo PostgreSQL nenà platné"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "MusÃte zadat existujÃcà úÄet, Äi správce."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Uživatelské jméno, Äi heslo Oracle nenà platné"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Uživatelské jméno, Äi heslo MySQL nenà platné"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Chyba DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "PodezÅ™elý pÅ™Ãkaz byl: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Zahodit uživatele z MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Zahodit uživatele z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "PodezÅ™elý pÅ™Ãkaz byl: \"%s\", jméno: %s, heslo: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Uživatelské jméno, Äi heslo MSSQL nenà platné: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nenà správně nastaven pro umožněnà synchronizace, protože rozhranà WebDAV je rozbité."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Zkonzultujte, prosÃm, <a href='%s'>průvodce instalacÃ</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "před pár vteřinami"
+msgstr "před vteřinami"
#: template.php:114
msgid "1 minute ago"
-msgstr "před minutou"
+msgstr "před 1 minutou"
#: template.php:115
#, php-format
@@ -229,12 +231,25 @@ msgstr "PÅ™ed %d mÄ›sÃci"
#: template.php:123
msgid "last year"
-msgstr "minulý rok"
+msgstr "loni"
#: template.php:124
msgid "years ago"
msgstr "před lety"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s je dostupná. ZÃskat <a href=\"%s\">vÃce informacÃ</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "aktuálnÃ"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "kontrola aktualizacà je vypnuta"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index d0c227483e..7cf113bc59 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <icewind1991@gmail.com>, 2012.
+# Jan Krejci <krejca85@gmail.com>, 2011-2012.
+# Martin <fireball@atlas.cz>, 2011-2012.
+# Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +27,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nelze naÄÃst seznam z App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Chyba ověřenÃ"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Vaše zobrazované jméno bylo změněno."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Nelze změnit zobrazované jméno"
@@ -120,7 +122,7 @@ msgstr "Chyba při aktualizaci aplikace"
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Ukládám..."
@@ -136,16 +138,16 @@ msgstr "zpět"
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Smazat"
@@ -165,7 +167,7 @@ msgstr "Chyba při vytvářenà užiatele"
msgid "A valid password must be provided"
msgstr "MusÃte zadat platné heslo"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "ÄŒesky"
@@ -316,19 +318,19 @@ msgstr "Záznam"
msgid "Log level"
msgstr "Úroveň záznamu"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "VÃce"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Méně"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +401,7 @@ msgstr "ZÃskat aplikace pro synchronizaci vaÅ¡ich souborů"
msgid "Show First Run Wizard again"
msgstr "Znovu zobrazit průvodce prvnÃm spuÅ¡tÄ›nÃm"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Heslo"
@@ -423,70 +425,82 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Zobrazované jméno"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Vaše zobrazované jméno bylo změněno"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Nelze změnit vaše zobrazované jméno"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Změnit zobrazované jméno"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Vaše e-mailová adresa"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Pro povolenà změny hesla vyplňte adresu e-mailu"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použijte tuto adresu pro připojenà k vašemu ownCloud skrze správce souborů"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Přihlašovacà jméno"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Vytvořit"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Výchozà úložiště"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "NeomezenÄ›"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "Jiný"
+msgstr "Jiná"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Úložiště"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "změnit zobrazované jméno"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "nastavit nové heslo"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "VýchozÃ"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index ef1a936b3d..228f59ec1c 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 4a7f86d0d2..70dc34cea5 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-17 14:10+0000\n"
+"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -293,7 +294,7 @@ msgstr "Dolen ar gyfer rhannu"
msgid "Password protect"
msgstr "Diogelu cyfrinair"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Cyfrinair"
@@ -396,27 +397,24 @@ msgstr "ailosod cyfrinair ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Ailosod anfon e-bost."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Methodd y cais!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Enw defnyddiwr"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Gwneud cais i ailosod"
@@ -560,42 +558,37 @@ msgstr "Gorffen sefydlu"
msgid "web services under your control"
msgstr "gwasanaethau gwe a reolir gennych"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Allgofnodi"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Gwrthodwyd mewngofnodi awtomatig!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Wedi colli'ch cyfrinair?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "cofio"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Mewngofnodi"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Mewngofnodiadau Amgen"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 67f9d373ec..21de4f158f 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-22 01:57+0200\n"
+"PO-Revision-Date: 2013-04-21 20:50+0000\n"
+"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,19 +79,15 @@ msgstr "Cyfeiriadur annilys."
msgid "Files"
msgstr "Ffeiliau"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Rhannu"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Dileu'n barhaol"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Dileu"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Ailenwi"
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index bb5e3cedbe..6ffe72043a 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 58a199c994..1b5cc6d424 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-18 02:03+0200\n"
+"PO-Revision-Date: 2013-04-17 17:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index e2faba0dd7..01a7b7ff6e 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 15:00+0000\n"
+"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 249f562bfa..5e9bb4d912 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 21:10+0000\n"
+"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/cy_GB/files_versions.po b/l10n/cy_GB/files_versions.po
index 2d178293a3..0f19e914bb 100644
--- a/l10n/cy_GB/files_versions.po
+++ b/l10n/cy_GB/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 7c6413276e..8a34f9cc6b 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 19:21+0000\n"
+"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -113,72 +114,72 @@ msgstr "%s does dim hawl defnyddio dot yn enw'r gronfa ddata"
msgid "%s set the database host."
msgstr "%s gosod gwesteiwr y gronfa ddata."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Enw a/neu gyfrinair Oracle annilys"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Enw a/neu gyfrinair MySQL annilys"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Gwall DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Gollwng y defnyddiwr hwn o MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Gollwng y defnyddiwr hwn o MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
@@ -235,6 +236,19 @@ msgstr "y llynedd"
msgid "years ago"
msgstr "blwyddyn yn ôl"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ar gael. <a href=\"%s\">Mwy o wybodaeth</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "cyfredol"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "gwirio am ddiweddariadau wedi'i analluogi"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index a715f7c753..9612ffbaf6 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 20:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Gwall dilysu"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,9 +116,9 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Yn cadw..."
+msgstr ""
#: js/users.js:43
msgid "deleted"
@@ -136,16 +132,16 @@ msgstr "dadwneud"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Dileu"
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -324,11 +320,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Cyfrinair"
@@ -423,70 +419,82 @@ msgstr "Cyfrinair newydd"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Arall"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 2c054ee189..60042b502e 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 19:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 5d4fa6016a..3b03eb966d 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,12 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Bawl <transifex@bawl.dk>, 2013.
+# <cronner@gmail.com>, 2012.
+# Frederik Lassen <frederiklassen@gmail.com>, 2013.
+# <mikkelbjerglarsen@gmail.com>, 2011, 2012.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
+# Ole Holm Frandsen <froksen@gmail.com>, 2012.
+# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# Rasmus Paasch <rasmuspaasch@gmail.com>, 2013.
+# <simon@rosmi.dk>, 2012.
+# Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -218,7 +229,7 @@ msgstr "OK"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Annuller"
+msgstr "Fortryd"
#: js/oc-dialogs.js:185
msgid "Choose"
@@ -293,7 +304,7 @@ msgstr "Del med link"
msgid "Password protect"
msgstr "Beskyt med adgangskode"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Kodeord"
@@ -396,27 +407,24 @@ msgstr "Nulstil ownCloud kodeord"
msgid "Use the following link to reset your password: {link}"
msgstr "Anvend følgende link til at nulstille din adgangskode: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Reset-mail afsendt."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Anmodningen mislykkedes!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Brugernavn"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Anmod om nulstilling"
@@ -438,7 +446,7 @@ msgstr "Nulstil kodeord"
#: strings.php:5
msgid "Personal"
-msgstr "Personligt"
+msgstr "Personlig"
#: strings.php:6
msgid "Users"
@@ -522,37 +530,37 @@ msgstr "Avanceret"
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "vil blive brugt"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Databasebruger"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Databasekodeord"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Navn på database"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Database tabelplads"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Databasehost"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Afslut opsætning"
@@ -560,42 +568,37 @@ msgstr "Afslut opsætning"
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Log ud"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatisk login afvist!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Skift adgangskode for at sikre din konto igen."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Mistet dit kodeord?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "husk"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Log ind"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternative logins"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 7c3fb5f5a2..c43e600f79 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,12 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
+# Frederik Lassen <frederiklassen@gmail.com>, 2013.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
+# Ole Holm Frandsen <froksen@gmail.com>, 2012.
+# <osos@openeyes.dk>, 2012.
+# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# <simon@rosmi.dk>, 2012.
+# Thomas <cronner@gmail.com>, 2013.
+# Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +47,7 @@ msgstr "Ingen fil blev uploadet. Ukendt fejl."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
+msgstr "Der er ingen fejl, filen blev uploadet med success"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +58,19 @@ msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
+msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Filen blev kun delvist uploadet."
+msgstr "Den uploadede file blev kun delvist uploadet"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Ingen fil uploadet"
+msgstr "Ingen fil blev uploadet"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Manglende midlertidig mappe."
+msgstr "Mangler en midlertidig mappe"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +88,15 @@ msgstr "Ugyldig mappe."
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Del"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Slet permanent"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Slet"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Omdøb"
@@ -132,7 +138,7 @@ msgstr "1 fil uploades"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "uploader filer"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,11 +170,11 @@ msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
+msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
#: js/files.js:272
msgid "Not enough space available"
-msgstr "ikke nok tilgængelig ledig plads "
+msgstr ""
#: js/files.js:312
msgid "Upload cancelled."
@@ -297,7 +303,7 @@ msgstr "Fjern deling"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Upload er for stor"
+msgstr "Upload for stor"
#: templates/index.php:110
msgid ""
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 9d253656f2..8c8605731d 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Frederik Lassen <frederiklassen@gmail.com>, 2013.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
+# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 85d11b63bf..e8c3c21931 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Bawl <transifex@bawl.dk>, 2013.
+# <cronner@gmail.com>, 2012.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# Ole Holm Frandsen <froksen@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +41,19 @@ msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
msgid "Error configuring Google Drive storage"
msgstr "Fejl ved konfiguration af Google Drive plads"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Advarsel:</b> Understøttelsen for Curl i PHP er enten ikke aktiveret eller ikke installeret. Det er ikke muligt, at montere ownCloud / WebDAV eller GoogleDrive. Spørg din system administrator om at installere det. "
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Ekstern opbevaring"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 39cc42941e..95f966c2f2 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index cad9f8798d..d0728a8d9c 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Bawl <transifex@bawl.dk>, 2013.
+# Frederik Lassen <frederiklassen@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 4dcf5e81f4..7ceccbf261 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Frederik Lassen <frederiklassen@gmail.com>, 2013.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# <osos@openeyes.dk>, 2012.
+# Thomas <cronner@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index ac8b6efab1..f14b4dd258 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# cronner <cronner@gmail.com>, 2012
+# Frederik Lassen <frederiklassen@gmail.com>, 2013
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012-2013
+# osos <osos@openeyes.dk>, 2012
+# cronner <cronner@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +28,7 @@ msgstr "Hjælp"
#: app.php:362
msgid "Personal"
-msgstr "Personligt"
+msgstr "Personlig"
#: app.php:373
msgid "Settings"
@@ -113,72 +118,72 @@ msgstr "%s du må ikke bruge punktummer i databasenavnet."
msgid "%s set the database host."
msgstr "%s sæt database værten."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Databasefejl: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fejlende kommando var: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Slet denne bruger fra MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Slet denne bruger fra MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
@@ -207,11 +212,11 @@ msgstr "%d timer siden"
#: template.php:118
msgid "today"
-msgstr "i dag"
+msgstr "I dag"
#: template.php:119
msgid "yesterday"
-msgstr "i går"
+msgstr "I går"
#: template.php:120
#, php-format
@@ -220,7 +225,7 @@ msgstr "%d dage siden"
#: template.php:121
msgid "last month"
-msgstr "sidste måned"
+msgstr "Sidste måned"
#: template.php:122
#, php-format
@@ -229,12 +234,25 @@ msgstr "%d måneder siden"
#: template.php:123
msgid "last year"
-msgstr "sidste år"
+msgstr "Sidste år"
#: template.php:124
msgid "years ago"
msgstr "Ã¥r siden"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s er tilgængelig. Få <a href=\"%s\">mere information</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "opdateret"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "Check for opdateringer er deaktiveret"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 7108c62b3c..47340bcdee 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,12 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
+# Frederik Lassen <frederiklassen@gmail.com>, 2013.
+# <icewind1991@gmail.com>, 2012.
+# <mikkelbjerglarsen@gmail.com>, 2011.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
+# Ole Holm Frandsen <froksen@gmail.com>, 2012.
+# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+# <simon@rosmi.dk>, 2012.
+# <sr@ybnet.dk>, 2012-2013.
+# Thomas <cronner@gmail.com>, 2013.
+# Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +33,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Kunne ikke indlæse listen fra App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Adgangsfejl"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Kunne ikke skifte skærmnavn"
@@ -120,7 +128,7 @@ msgstr "Der opstod en fejl under app opgraderingen"
msgid "Updated"
msgstr "Opdateret"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Gemmer..."
@@ -136,16 +144,16 @@ msgstr "fortryd"
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Slet"
@@ -165,7 +173,7 @@ msgstr "Fejl ved oprettelse af bruger"
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Dansk"
@@ -316,19 +324,19 @@ msgstr "Log"
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Mere"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -397,9 +405,9 @@ msgstr "Hent applikationerne for at synkronisere dine filer"
#: templates/personal.php:26
msgid "Show First Run Wizard again"
-msgstr "Vis Første Kørsels Guiden igen."
+msgstr "Vis Første Kørsel Guiden igen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Kodeord"
@@ -417,76 +425,88 @@ msgstr "Nuværende adgangskode"
#: templates/personal.php:42
msgid "New password"
-msgstr "Nyt kodeord"
+msgstr "Ny adgangskode"
#: templates/personal.php:44
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Skærmnavn"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "E-mail"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Dit skærmnavn blev ændret"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Kunne ikke skifte dit skærmnavn"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Skift skærmnavn"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Din emailadresse"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Sprog"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Loginnavn"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Ny"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Standard opbevaring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ubegrænset"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Andet"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Opbevaring"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "skift skærmnavn"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "skift kodeord"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index ed3dbcd50a..98e5a1e4f0 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blah@blacksunset.dk>, 2012.
+# <cronner@gmail.com>, 2012.
+# Frederik Lassen <frederiklassen@gmail.com>, 2012.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# <sr@ybnet.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 2057a46835..ff7be03630 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -3,14 +3,31 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# goeck <admin@s-goecker.de>, 2011-2012
+# infinity8 <alex.hotz@gmail.com>, 2011
+# Mirodin <blobbyjj@ymail.com>, 2012
+# <georg.stefan.germany@googlemail.com>, 2011
+# I Robot <owncloud-bot@tmit.eu>, 2012-2013
+# I Robot <thomas.mueller@tmit.eu>, 2012
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011
+# Lukas Reschke <lukas@statuscode.ch>, 2013
+# fmms <mail@felixmoeller.de>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# thiel <markus.thiel@desico.de>, 2012
+# mike.f <m.fresel@sysangels.com>, 2012
+# JamFX <niko@nik-o-mat.de>, 2012
+# Phi Lieb <>, 2012
+# Susi <>, 2012
+# <thomas.mueller@tmit.eu>, 2012
+# <transifex.3.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-17 12:50+0000\n"
+"Last-Translator: Lukas Reschke <lukas@statuscode.ch>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -294,7 +311,7 @@ msgstr "Ãœber einen Link freigegeben"
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Passwort"
@@ -397,27 +414,24 @@ msgstr "ownCloud-Passwort zurücksetzen"
msgid "Use the following link to reset your password: {link}"
msgstr "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist frage Deinen lokalen Administrator."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Die Anfrage schlug fehl!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Beantrage Zurücksetzung"
@@ -447,11 +461,11 @@ msgstr "Benutzer"
#: strings.php:7
msgid "Apps"
-msgstr "Apps"
+msgstr "Anwendungen"
#: strings.php:8
msgid "Admin"
-msgstr "Administration"
+msgstr "Admin"
#: strings.php:9
msgid "Help"
@@ -559,44 +573,39 @@ msgstr "Installation abschließen"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "Web-Services unter Deiner Kontrolle"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "Web-Services unter Ihrer Kontrolle"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Abmelden"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatischer Login zurückgewiesen!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 19a6349e68..c401e3168d 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,13 +3,35 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# goeck <admin@s-goecker.de>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2012-2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011
+# Jan-Christoph Borchardt <jan@unhosted.org>, 2011
+# Lukas Reschke <lukas@statuscode.ch>, 2012
+# fmms <mail@felixmoeller.de>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# thiel <markus.thiel@desico.de>, 2013
+# Michael Krell <m4dmike.mni@gmail.com>, 2012
+# piccobello <nelsonfritsch@gmail.com>, 2012
+# JamFX <niko@nik-o-mat.de>, 2012
+# Phi Lieb <>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Thomas Müller <>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Linutux <transifex.com@mail.simonzoellner.de>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# Wachhund <wachhund@wachhund.to>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:03+0200\n"
+"PO-Revision-Date: 2013-04-17 07:21+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +59,7 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich übertragen."
+msgstr "Datei fehlerfrei hochgeladen."
#: ajax/upload.php:27
msgid ""
@@ -48,19 +70,19 @@ msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist"
+msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Die Datei konnte nur teilweise übertragen werden"
+msgstr "Die Datei wurde nur teilweise hochgeladen."
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Keine Datei konnte übertragen werden."
+msgstr "Es wurde keine Datei hochgeladen."
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Kein temporärer Ordner vorhanden"
+msgstr "Temporärer Ordner fehlt."
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +100,15 @@ msgstr "Ungültiges Verzeichnis."
msgid "Files"
msgstr "Dateien"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Teilen"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
-msgstr "Endgültig löschen"
+msgstr "Permanent löschen"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Löschen"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Umbenennen"
@@ -201,7 +219,7 @@ msgstr "Größe"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "Geändert"
+msgstr "Bearbeitet"
#: js/files.js:893
msgid "1 folder"
@@ -289,15 +307,15 @@ msgstr "Alles leer. Lade etwas hoch!"
#: templates/index.php:76
msgid "Download"
-msgstr "Download"
+msgstr "Herunterladen"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Freigabe aufheben"
+msgstr "Nicht mehr freigeben"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Der Upload ist zu groß"
+msgstr "Upload zu groß"
#: templates/index.php:110
msgid ""
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index d3f07f05c7..9e734d80a3 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <driz@i2pmail.org>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "Schließe die folgenden Dateitypen von der Verschlüsselung aus:"
#: templates/settings.php:12
msgid "None"
-msgstr "Nichts"
+msgstr "Keine"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index b6255cd3ef..3bd88c78ec 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -3,14 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <stefan.niedermann@googlemail.com>, 2013.
+# <thomas.mueller@tmit.eu>, 2012.
+# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 15:10+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,26 +43,19 @@ msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
msgid "Error configuring Google Drive storage"
msgstr "Fehler beim Einrichten von Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Warnung:</b> Die Curl-Unterstützung in PHP ist nicht aktiviert oder installiert. Das Einbinden von ownCloud / WebDav der GoogleDrive-Freigaben ist nicht möglich. Bitte Deinen Systemadminstrator um die Installation. "
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Externer Speicher"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 77148131a1..d3e9a36763 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
+# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 3a8c59bd02..e4aa758e23 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -3,13 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# Wachhund <wachhund@wachhund.to>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:03+0200\n"
+"PO-Revision-Date: 2013-04-17 07:26+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index e0fd8f7fa6..fd4ea22a0e 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <mail@felixmoeller.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# <niko@nik-o-mat.de>, 2012.
+# <stefan.niedermann@googlemail.com>, 2013.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 4fc5815b16..6e43319234 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,12 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mirodin <blobbyjj@ymail.com>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# Phi Lieb <>, 2012
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -39,7 +49,7 @@ msgstr "Apps"
#: app.php:406
msgid "Admin"
-msgstr "Administration"
+msgstr "Administrator"
#: files.php:209
msgid "ZIP download is turned off."
@@ -67,7 +77,7 @@ msgstr "Die Anwendung ist nicht aktiviert"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Fehler bei der Anmeldung"
+msgstr "Authentifizierungs-Fehler"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,75 +123,75 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
msgid "%s set the database host."
msgstr "%s setze den Datenbank-Host"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle Benutzername und/oder Passwort ungültig"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL Benutzername und/oder Passwort ungültig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fehler: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fehlerhafter Befehl war: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Lösche diesen Benutzer von MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Lösche diesen Benutzer aus MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
-#: setup.php:858
+#: setup.php:853
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:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
+msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
#: template.php:113
msgid "seconds ago"
@@ -189,7 +199,7 @@ msgstr "Gerade eben"
#: template.php:114
msgid "1 minute ago"
-msgstr "vor einer Minute"
+msgstr "Vor einer Minute"
#: template.php:115
#, php-format
@@ -235,6 +245,19 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "aktuell"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "Die Update-Überprüfung ist ausgeschaltet"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 43ac32ddf2..0f6b2fc926 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -3,14 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# goeck <admin@s-goecker.de>, 2011, 2012
+# Mirodin <blobbyjj@ymail.com>, 2012
+# Robin Appelman <icewind1991@gmail.com>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2012-2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011
+# Jan T <jan-temesinko@web.de>, 2012
+# Lukas Reschke <lukas@statuscode.ch>, 2012
+# fmms <mail@felixmoeller.de>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# thiel <markus.thiel@desico.de>, 2012
+# AndryXY <mibunrui@gmx.de>, 2012
+# piccobello <nelsonfritsch@gmail.com>, 2012
+# JamFX <niko@nik-o-mat.de>, 2012
+# Phi Lieb <>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# Wachhund <wachhund@wachhund.to>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-17 07:21+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +41,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Fehler bei der Anmeldung"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Dein Anzeigename ist geändert worden."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
@@ -69,7 +84,7 @@ msgstr "Sprache geändert"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Fehlerhafte Anfrage"
+msgstr "Ungültige Anfrage"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -121,7 +136,7 @@ msgstr "Fehler beim Aktualisieren der App"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Speichern..."
@@ -137,16 +152,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Benutzer konnte nicht entfernt werden."
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Löschen"
@@ -166,7 +181,7 @@ msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Deutsch (Persönlich)"
@@ -325,11 +340,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +415,7 @@ msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
msgid "Show First Run Wizard again"
msgstr "Erstinstallation erneut durchführen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Passwort"
@@ -424,70 +439,82 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Anzeigename"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Dein Anzeigename wurde geändert"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Das Ändern deines Anzeigenamens ist nicht möglich"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Anzeigenamen ändern"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Deine E-Mail-Adresse"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Hilf bei der Ãœbersetzung"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Loginname"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Anlegen"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 008eb03bc4..c76b328283 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,12 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# Maurice Preuß <>, 2012.
+# <niko@nik-o-mat.de>, 2012.
+# Phi Lieb <>, 2012.
+# Susi <>, 2012.
+# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index d49333cbd6..666f0eeb26 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -3,14 +3,35 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# goeck <admin@s-goecker.de>, 2011-2012
+# infinity8 <alex.hotz@gmail.com>, 2011
+# a.tangemann <a.tangemann@web.de>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2012
+# deh3nne <deh3nne@deviantdev.com>, 2012
+# george <social@georgehrke.com>, 2011
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011
+# Lukas Reschke <lukas@statuscode.ch>, 2013
+# fmms <mail@felixmoeller.de>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# mike.f <m.fresel@sysangels.com>, 2012
+# JamFX <niko@nik-o-mat.de>, 2012
+# Phi Lieb <>, 2012
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2013
+# Valermos <Steve_Reichert@gmx.de>, 2013
+# Susi <>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-17 12:50+0000\n"
+"Last-Translator: Lukas Reschke <lukas@statuscode.ch>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -211,7 +232,7 @@ msgstr "Letztes Jahr"
#: js/js.js:730
msgid "years ago"
-msgstr "Vor Jahren"
+msgstr "Vor Jahren"
#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
msgid "Ok"
@@ -294,7 +315,7 @@ msgstr "Ãœber einen Link teilen"
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Passwort"
@@ -397,27 +418,24 @@ msgstr "ownCloud-Passwort zurücksetzen"
msgid "Use the following link to reset your password: {link}"
msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer sinnvollen Zeitspanne erhalten prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist fragen Sie Ihren lokalen Administrator."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Eine E-Mail zum Zurücksetzen des Passworts wurde gesendet."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Die Anfrage schlug fehl!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Zurücksetzung beantragen"
@@ -447,11 +465,11 @@ msgstr "Benutzer"
#: strings.php:7
msgid "Apps"
-msgstr "Apps"
+msgstr "Anwendungen"
#: strings.php:8
msgid "Admin"
-msgstr "Administrator"
+msgstr "Admin"
#: strings.php:9
msgid "Help"
@@ -467,7 +485,7 @@ msgstr "Cloud wurde nicht gefunden"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Kategorien ändern"
+msgstr "Kategorien bearbeiten"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -561,42 +579,37 @@ msgstr "Installation abschließen"
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Abmelden"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatische Anmeldung verweigert."
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 54713d0596..0e5e25200e 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -3,13 +3,40 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# goeck <admin@s-goecker.de>, 2012
+# a.tangemann <a.tangemann@web.de>, 2013
+# a.tangemann <a.tangemann@web.de>, 2012-2013
+# Mirodin <blobbyjj@ymail.com>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2012-2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011
+# Jan-Christoph Borchardt <jan@unhosted.org>, 2011
+# Lukas Reschke <lukas@statuscode.ch>, 2012
+# fmms <mail@felixmoeller.de>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# thiel <markus.thiel@desico.de>, 2013
+# Michael Krell <m4dmike.mni@gmail.com>, 2012
+# piccobello <nelsonfritsch@gmail.com>, 2012
+# JamFX <niko@nik-o-mat.de>, 2012
+# Phi Lieb <>, 2012
+# quick_wango <quick_wango@code-infection.de>, 2013
+# robN <robert.neumann01@gmail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2013
+# Valermos <Steve_Reichert@gmx.de>, 2013
+# Susi <>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Thomas Müller <>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 20:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:03+0200\n"
+"PO-Revision-Date: 2013-04-17 08:22+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,15 +75,15 @@ msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist"
+msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Die Datei konnte nur teilweise übertragen werden"
+msgstr "Die Datei wurde nur teilweise hochgeladen."
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Keine Datei konnte übertragen werden."
+msgstr "Es wurde keine Datei hochgeladen."
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +105,15 @@ msgstr "Ungültiges Verzeichnis."
msgid "Files"
msgstr "Dateien"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Teilen"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
-msgstr "Endgültig löschen"
+msgstr "Entgültig löschen"
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Löschen"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Umbenennen"
@@ -156,66 +179,66 @@ 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:231
+#: js/files.js:226
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:264
+#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
+msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
-#: js/files.js:277
+#: js/files.js:272
msgid "Not enough space available"
msgstr "Nicht genügend Speicherplatz verfügbar"
-#: js/files.js:317
+#: js/files.js:312
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/files.js:413
+#: js/files.js:408
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:486
+#: js/files.js:481
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/files.js:491
+#: js/files.js:486
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:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
msgid "Error"
msgstr "Fehler"
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:872 templates/index.php:70
msgid "Name"
msgstr "Name"
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:873 templates/index.php:81
msgid "Size"
msgstr "Größe"
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:874 templates/index.php:83
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:898
+#: js/files.js:893
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:900
+#: js/files.js:895
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:908
+#: js/files.js:903
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:910
+#: js/files.js:905
msgid "{count} files"
msgstr "{count} Dateien"
@@ -279,37 +302,37 @@ msgstr "Gelöschte Dateien"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:54
+#: templates/index.php:55
msgid "You don’t have write permissions here."
msgstr "Sie haben hier keine Schreib-Berechtigungen."
-#: templates/index.php:61
+#: templates/index.php:62
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Bitte laden Sie etwas hoch!"
-#: templates/index.php:75
+#: templates/index.php:76
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:107
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: templates/index.php:109
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
-#: templates/index.php:114
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:117
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Scanne"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index ef17e7de8f..cb549f90fd 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <admin@kaio.ws>, 2013.
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
+# <driz@i2pmail.org>, 2012.
+# Marc-Andre Husyk <member@wue.de>, 2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# Susi <>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -35,4 +41,4 @@ msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:"
#: templates/settings.php:12
msgid "None"
-msgstr "Nichts"
+msgstr "Keine"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 39812499d9..3b72b5747d 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -3,14 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# <blobbyjj@ymail.com>, 2012.
+# <deh3nne@deviantdev.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <stefan.niedermann@googlemail.com>, 2013.
+# <thomas.mueller@tmit.eu>, 2012.
+# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 15:10+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,26 +43,19 @@ msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
msgid "Error configuring Google Drive storage"
msgstr "Fehler beim Einrichten von Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Achtung:</b> Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Externer Speicher"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 1c1c9d6020..0f52dc9f53 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
+# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -23,7 +28,7 @@ msgstr "Passwort"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Bestätigen"
+msgstr "Absenden"
#: templates/public.php:10
#, php-format
@@ -37,7 +42,7 @@ msgstr "%s hat die Datei %s mit Ihnen geteilt"
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Herunterladen"
+msgstr "Download"
#: templates/public.php:40
msgid "No preview available for"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 2e9654699e..00c1b90925 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
+# I Robot <owncloud-bot@tmit.eu>, 2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# Phillip Schichtel <quick_wango@code-infection.de>, 2013.
+# <stefan.niedermann@googlemail.com>, 2013.
+# Susi <>, 2013.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 4218653d90..341c1a1b00 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -3,13 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <mail@felixmoeller.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# <niko@nik-o-mat.de>, 2013.
+# <niko@nik-o-mat.de>, 2012.
+# <robert.neumann01@gmail.com>, 2013.
+# <stefan.niedermann@googlemail.com>, 2013.
+# <thomas.mueller@tmit.eu>, 2012.
+# <transifex-2.7.mensaje@spamgourmet.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 20:39+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index bfad776e8e..e21abf4d38 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,12 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# a.tangemann <a.tangemann@web.de>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# Phi Lieb <>, 2012
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -113,72 +124,72 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
msgid "%s set the database host."
msgstr "%s setze den Datenbank-Host"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
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."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle Benutzername und/oder Passwort ungültig"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL Benutzername und/oder Passwort ungültig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fehler: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fehlerhafter Befehl war: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Lösche diesen Benutzer aus MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Lösche diesen Benutzer aus MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
-#: setup.php:858
+#: setup.php:853
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 noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
+msgstr "Ihr Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
@@ -189,7 +200,7 @@ msgstr "Gerade eben"
#: template.php:114
msgid "1 minute ago"
-msgstr "Vor 1 Minute"
+msgstr "Vor einer Minute"
#: template.php:115
#, php-format
@@ -235,6 +246,19 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "aktuell"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "Die Update-Überprüfung ist ausgeschaltet"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 983e3752d4..718fd022b4 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -3,14 +3,38 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arkascha <foss@christian-reiner.info>, 2013
+# goeck <admin@s-goecker.de>, 2011-2012
+# a.tangemann <a.tangemann@web.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2012
+# Robin Appelman <icewind1991@gmail.com>, 2012
+# I Robot <owncloud-bot@tmit.eu>, 2012-2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011
+# Jan T <jan-temesinko@web.de>, 2012
+# Lukas Reschke <lukas@statuscode.ch>, 2013
+# Lukas Reschke <lukas@statuscode.ch>, 2012
+# fmms <mail@felixmoeller.de>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013
+# piccobello <nelsonfritsch@gmail.com>, 2012
+# JamFX <niko@nik-o-mat.de>, 2012
+# Phi Lieb <>, 2012
+# quick_wango <quick_wango@code-infection.de>, 2013
+# robN <robert.neumann01@gmail.com>, 2013
+# seeed <seeed@freenet.de>, 2012
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2013
+# Susi <>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
+# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:40+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-17 07:20+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +46,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Authentifizierungs-Fehler"
+msgstr "Fehler bei der Anmeldung"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Dein Anzeigename ist geändert worden."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
@@ -69,7 +89,7 @@ msgstr "Sprache geändert"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Ungültige Anforderung"
+msgstr "Ungültige Anfrage"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -121,7 +141,7 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Speichern..."
@@ -137,16 +157,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Löschen"
@@ -166,7 +186,7 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Deutsch (Förmlich: Sie)"
@@ -325,11 +345,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +420,7 @@ msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
msgid "Show First Run Wizard again"
msgstr "Den Einrichtungsassistenten erneut anzeigen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Passwort"
@@ -424,70 +444,82 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Anzeigename"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Ihr Anzeigename wurde geändert"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Das Ändern Ihres Anzeigenamens ist nicht möglich"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Anzeigenamen ändern"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Ihre E-Mail-Adresse"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Helfen Sie bei der Ãœbersetzung"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Loginname"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
-msgstr "Erstellen"
+msgstr "Anlegen"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 2d41e90563..d35dff4931 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,12 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
+# <blobbyjj@ymail.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# Maurice Preuß <>, 2012.
+# <niko@nik-o-mat.de>, 2012.
+# Phi Lieb <>, 2012.
+# <robert.neumann01@gmail.com>, 2013.
+# <stefan.niedermann@googlemail.com>, 2013.
+# Susi <>, 2013.
+# <transifex-2.7.mensaje@spamgourmet.com>, 2013.
+# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
+# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index e5c54f4c71..17bdcf4ca7 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,14 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Wasilis <m.wasilis@yahoo.de>, 2013
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# axil Pι <axilleas@archlinux.gr>, 2012.
+# Dimitris M. <monopatis@gmail.com>, 2012-2013.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
+# Marios Bekatoros <>, 2012.
+# <petros.kyladitis@gmail.com>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
+# <vagelis@cyberdest.com>, 2013.
+# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -295,7 +303,7 @@ msgstr "ΔιαμοιÏασμός με σÏνδεσμο"
msgid "Password protect"
msgstr "Î Ïοστασία συνθηματικοÏ"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Συνθηματικό"
@@ -398,27 +406,24 @@ msgstr "ΕπαναφοÏά ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "ΧÏησιμοποιήστε τον ακόλουθο σÏνδεσμο για να επανεκδόσετε τον κωδικό: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Ο σÏνδεσμος για να επανακτήσετε τον κωδικό σας Îχει σταλεί στο email <br>αν δεν το λάβετε μÎσα σε οÏισμÎνο διάστημα, ελÎγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί Ïωτήστε τον τοπικό σας διαχειÏιστή "
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Η αίτηση απÎτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? "
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Θα λάβετε Îνα σÏνδεσμο για να επαναφÎÏετε τον κωδικό Ï€Ïόσβασής σας μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Η επαναφοÏά του email στάλθηκε."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Η αίτηση απÎτυχε!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Όνομα χÏήστη"
+msgstr "Όνομα ΧÏήστη"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "ΕπαναφοÏά αίτησης"
@@ -524,80 +529,75 @@ msgstr "Για Ï€ÏοχωÏημÎνους"
msgid "Data folder"
msgstr "Φάκελος δεδομÎνων"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "ΡÏθμιση της βάσης δεδομÎνων"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "θα χÏησιμοποιηθοÏν"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "ΧÏήστης της βάσης δεδομÎνων"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Συνθηματικό βάσης δεδομÎνων"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Όνομα βάσης δεδομÎνων"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Κενά Πινάκων Βάσης ΔεδομÎνων"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Διακομιστής βάσης δεδομÎνων"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "ΟλοκλήÏωση εγκατάστασης"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "υπηÏεσίες δικτÏου υπό τον Îλεγχό σας"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "ΥπηÏεσίες web υπό τον Îλεγχό σας"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "ΑποσÏνδεση"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "ΑποÏÏίφθηκε η αυτόματη σÏνδεση!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Εάν δεν αλλάξατε το συνθηματικό σας Ï€Ïοσφάτως, ο λογαÏιασμός μποÏεί να Îχει διαÏÏεÏσει!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "ΠαÏακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαÏιασμό σας."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ξεχάσατε το συνθηματικό σας;"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "απομνημόνευση"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Είσοδος"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "ΕναλλακτικÎÏ‚ ΣυνδÎσεις"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index d411ad2cbc..6d69eade9c 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,12 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Axilleas Pi <axilleas@archlinux.gr>, 2013.
+# Dimitris M. <monopatis@gmail.com>, 2012-2013.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012-2013.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
+# Marios Bekatoros <>, 2012.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2013.
+# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
+# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -48,7 +58,7 @@ msgstr "Το αÏχείο που εστάλει υπεÏβαίνει την οδ
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Το ανεβασμÎνο αÏχείο υπεÏβαίνει το MAX_FILE_SIZE που οÏίζεται στην HTML φόÏμα"
+msgstr "Το αÏχείο υπεÏβαίνει την οδηγία μÎγιστου επιτÏÎµÏ€Ï„Î¿Ï Î¼ÎµÎ³Îθους \"MAX_FILE_SIZE\" που Îχει οÏιστεί στην HTML φόÏμα"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -78,19 +88,15 @@ msgstr "Μη ÎγκυÏος φάκελος."
msgid "Files"
msgstr "ΑÏχεία"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "ΔιαμοιÏασμός"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Μόνιμη διαγÏαφή"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "ΔιαγÏαφή"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Μετονομασία"
@@ -221,7 +227,7 @@ msgstr "{count} αÏχεία"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "ΜεταφόÏτωση"
+msgstr "Αποστολή"
#: templates/admin.php:5
msgid "File handling"
@@ -293,7 +299,7 @@ msgstr "Λήψη"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Σταμάτημα διαμοιÏασμοÏ"
+msgstr "Διακοπή κοινής χÏήσης"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index e3d818fc1b..657368cb3f 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dimitris M. <monopatis@gmail.com>, 2013.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +38,4 @@ msgstr "ΕξαίÏεση των παÏακάτω Ï„Ïπων αÏχείων απ
#: templates/settings.php:12
msgid "None"
-msgstr "Τίποτα"
+msgstr "Καμία"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 592955425a..ee87024042 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,14 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2012.
+# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
+# Γιάννης <yannanth@gmail.com>, 2012.
+# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,26 +44,19 @@ msgstr "ΠαÏακαλοÏμε δώστε ÎγκυÏο κλειδί Dropbox κα
msgid "Error configuring Google Drive storage"
msgstr "Σφάλμα Ïυθμίζωντας αποθήκευση Google Drive "
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Î Ïοσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η Ï€ÏοσάÏτηση CIFS/SMB. ΠαÏακαλώ ενημεÏώστε τον διαχειÏιστή συστήματος να το εγκαταστήσει."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Î Ïοσοχή:</b> Η υποστήÏιξη FTP στην PHP δεν ενεÏγοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η Ï€ÏοσάÏτηση FTP. ΠαÏακαλώ ενημεÏώστε τον διαχειÏιστή συστήματος να το εγκαταστήσει."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<Î Ïοειδοποίηση </b> Η υποστήÏιξη του συστήματος Curl στο PHP δεν είναι ενεÏγοποιημÎνη ή εγκαταστημÎνη. Η αναπαÏαγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. ΠαÏακαλώ Ïωτήστε τον διαχειÏιστλη του συστήματος για την εγκατάσταση. "
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "ΕξωτεÏικό Αποθηκευτικό ÎœÎσο"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 793338e63d..5f558cf118 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e4bef56ec1..b3db2cb372 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dimitris M. <monopatis@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 12369ab3d4..d87bcb7f29 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012-2013.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
+# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index aa1aed6797..73635112f6 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dimitris M. <monopatis@gmail.com>, 2013
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012
+# xneo1 <vagelis@cyberdest.com>, 2013
+# Wasilis <m.wasilis@yahoo.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +118,72 @@ msgstr "%s μάλλον δεν χÏησιμοποιείτε τελείες στ
msgid "%s set the database host."
msgstr "%s Ïυθμίση του κεντÏικόυ υπολογιστή βάσης δεδομÎνων. "
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της PostgreSQL"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "ΧÏειάζεται να εισάγετε είτε Îναν υπάÏχον λογαÏιασμό ή του διαχειÏιστή."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της Oracle"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της MySQL"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Σφάλμα Βάσης ΔεδομÎνων: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Η εντολη παÏαβατικοτητας ηταν: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "ΥπάÏχει ήδη ο χÏήστης '%s'@'localhost' της MySQL."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "ΑπόÏÏιψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη από την MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Ο χÏήστης '%s'@'%%' της MySQL υπάÏχει ήδη"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "ΑπόÏÏιψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη από την MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Η εντολη παÏαβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Το όνομα χÏήστη και/ή ο κωδικός της MS SQL δεν είναι ÎγκυÏα: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ο διακομιστής σας δεν Îχει Ïυθμιστεί κατάλληλα ώστε να επιτÏÎπει τον συγχÏονισμό αÏχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστÏαμμÎνη."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ΕλÎγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
@@ -211,7 +216,7 @@ msgstr "σήμεÏα"
#: template.php:119
msgid "yesterday"
-msgstr "χτες"
+msgstr "χθÎÏ‚"
#: template.php:120
#, php-format
@@ -220,7 +225,7 @@ msgstr "%d ημÎÏες Ï€Ïιν"
#: template.php:121
msgid "last month"
-msgstr "τελευταίο μήνα"
+msgstr "τον Ï€ÏοηγοÏμενο μήνα"
#: template.php:122
#, php-format
@@ -229,12 +234,25 @@ msgstr "%d μήνες Ï€Ïιν"
#: template.php:123
msgid "last year"
-msgstr "τελευταίο χÏόνο"
+msgstr "τον Ï€ÏοηγοÏμενο χÏόνο"
#: template.php:124
msgid "years ago"
msgstr "χÏόνια Ï€Ïιν"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s είναι διαθÎσιμο. Δείτε <a href=\"%s\">πεÏισσότεÏες πληÏοφοÏίες</a>"
+
+#: 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\""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 120f0a31d1..f80aa6d858 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,14 +3,27 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Dimitris M. <monopatis@gmail.com>, 2012-2013.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
+# <icewind1991@gmail.com>, 2012.
+# <icewind1991@gmail.com>, 2012.
+# Marios Bekatoros <>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
+# <petros.kyladitis@gmail.com>, 2011.
+# <petros.kyladitis@gmail.com>, 2011.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
+# <vagelis@cyberdest.com>, 2013.
+# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
+# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +35,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Σφάλμα στην φόÏτωση της λίστας από το App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Σφάλμα πιστοποίησης"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Το όνομα σας στην οθόνη άλλαξε. "
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Δεν είναι δυνατή η αλλαγή του ονόματος εμφάνισης"
@@ -121,9 +130,9 @@ msgstr "Σφάλμα κατά την ενημÎÏωση της εφαÏμογή
msgid "Updated"
msgstr "ΕνημεÏώθηκε"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Γίνεται αποθήκευση..."
+msgstr "Αποθήκευση..."
#: js/users.js:43
msgid "deleted"
@@ -137,16 +146,16 @@ msgstr "αναίÏεση"
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίÏεση χÏήστη"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Ομάδες"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Ομάδα ΔιαχειÏιστών"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "ΔιαγÏαφή"
@@ -166,7 +175,7 @@ msgstr "Σφάλμα δημιουÏγίας χÏήστη"
msgid "A valid password must be provided"
msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__όνομα_γλώσσας__"
@@ -317,19 +326,19 @@ msgstr "ΚαταγÏαφÎÏ‚"
msgid "Log level"
msgstr "Επίπεδο καταγÏαφής"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "ΠεÏισσότεÏα"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "ΛιγότεÏα"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +409,7 @@ msgstr "Λήψη της εφαÏμογής για συγχÏονισμό των
msgid "Show First Run Wizard again"
msgstr "Î Ïοβολή Î Ïώτης ΕκτÎλεσης ÎŸÎ´Î·Î³Î¿Ï Ï€Î¬Î»Î¹"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Συνθηματικό"
@@ -424,70 +433,82 @@ msgstr "ÎÎο συνθηματικό"
msgid "Change password"
msgstr "Αλλαγή συνθηματικοÏ"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Όνομα εμφάνισης"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Ηλ. ταχυδÏομείο"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Το όνομα εμφάνισής σας άλλαξε"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Αλλαγή ονόματος εμφάνισης"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Η διεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου σας"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "ΣυμπληÏώστε μια διεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για να ενεÏγοποιηθεί η ανάκτηση συνθηματικοÏ"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Γλώσσα"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφÏαση"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ΧÏήση αυτής της διεÏθυνσης για σÏνδεση στο ownCloud με τον διαχειÏιστή αÏχείων σας"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Όνομα ΣÏνδεσης"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "ΔημιουÏγία"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Î ÏοκαθοÏισμÎνη Αποθήκευση "
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "ΑπεÏιόÏιστο"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "Άλλο"
+msgstr "Άλλα"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Αποθήκευση"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "αλλαγή ονόματος εμφάνισης"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "επιλογή νÎου κωδικοÏ"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Î ÏοκαθοÏισμÎνο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 8b6e529e85..0685878dc0 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <anastasia2501@hotmail.com>, 2012.
+# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
+# Marios Bekatoros <>, 2012.
+# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index e012849caa..fd104b957c 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
+# Michael Moroni <haikara90@gmail.com>, 2012.
+# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +296,7 @@ msgstr "Kunhavigi per ligilo"
msgid "Password protect"
msgstr "Protekti per pasvorto"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Pasvorto"
@@ -396,27 +399,24 @@ msgstr "La pasvorto de ownCloud restariÄis."
msgid "Use the following link to reset your password: {link}"
msgstr "Uzu la jenan ligilon por restarigi vian pasvorton: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vi ricevos ligilon retpoÅte por rekomencigi vian pasvorton."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vi ricevos ligilon retpoÅte por rekomencigi vian pasvorton."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Peto malsukcesis!"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Uzantonomo"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Peti rekomencigon"
@@ -522,80 +522,75 @@ msgstr "Progresinta"
msgid "Data folder"
msgstr "Datuma dosierujo"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Agordi la datumbazon"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "estos uzata"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Datumbaza uzanto"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Datumbaza pasvorto"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Datumbaza nomo"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Datumbaza tabelospaco"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Datumbaza gastigo"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Fini la instalon"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "TTT-servoj regataj de vi"
+msgstr "TTT-servoj sub via kontrolo"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Elsaluti"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se vi ne ÅanÄis vian pasvorton lastatempe, via konto eble kompromitas!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Bonvolu ÅanÄi vian pasvorton por sekurigi vian konton ree."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ĉu vi perdis vian pasvorton?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "memori"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Ensaluti"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 8321aacc67..fb3dd94df1 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
+# Mariano <mstreet@kde.org.ar>, 2012.
+# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +40,7 @@ msgstr "Neniu dosiero alÅutiÄis. Nekonata eraro."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Ne estas eraro, la dosiero alÅutiÄis sukcese."
+msgstr "Ne estas eraro, la dosiero alÅutiÄis sukcese"
#: ajax/upload.php:27
msgid ""
@@ -52,15 +55,15 @@ msgstr "La dosiero alÅutita superas la regulon MAX_FILE_SIZE, kiu estas difinit
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "la alÅutita dosiero nur parte alÅutiÄis"
+msgstr "La alÅutita dosiero nur parte alÅutiÄis"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Neniu dosiero alÅutiÄis."
+msgstr "Neniu dosiero estas alÅutita"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Mankas provizora dosierujo."
+msgstr "Mankas tempa dosierujo"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +81,15 @@ msgstr "Nevalida dosierujo."
msgid "Files"
msgstr "Dosieroj"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Kunhavigi"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Forigi"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Alinomigi"
@@ -132,7 +131,7 @@ msgstr "1 dosiero estas alÅutata"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "dosieroj estas alÅutataj"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -297,7 +296,7 @@ msgstr "Malkunhavigi"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "AlÅuto tro larÄa"
+msgstr "ElÅuto tro larÄa"
#: templates/index.php:110
msgid ""
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 8b1ceb53a9..e909ea87bf 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index ef0f0605dd..97fd9187fc 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "Bonvolu provizi Ålosilon de la aplikaĵo Dropbox validan kaj sekretan."
msgid "Error configuring Google Drive storage"
msgstr "Eraro dum agordado de la memorservo Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Malena memorilo"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 4e6e0cbf14..e8fc61e328 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index df836da8a1..ef1aba79f4 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index f3fddd5909..03a9d97ec3 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <kristjan.schmidt@googlemail.com>, 2013.
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index b88a2dd5e2..1bd6af554d 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -113,79 +114,79 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
#: template.php:113
msgid "seconds ago"
-msgstr "sekundoj antaÅe"
+msgstr "sekundojn antaÅe"
#: template.php:114
msgid "1 minute ago"
@@ -220,7 +221,7 @@ msgstr "antaÅ %d tagoj"
#: template.php:121
msgid "last month"
-msgstr "lastamonate"
+msgstr "lasta monato"
#: template.php:122
#, php-format
@@ -229,11 +230,24 @@ msgstr "antaÅ %d monatoj"
#: template.php:123
msgid "last year"
-msgstr "lastajare"
+msgstr "lasta jaro"
#: template.php:124
msgid "years ago"
-msgstr "jaroj antaÅe"
+msgstr "jarojn antaÅe"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "Äisdata"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "Äisdateckontrolo estas malkapabligita"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 24fba7f1cb..5ad89620f3 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
+# Mariano <mstreet@kde.org.ar>, 2012.
+# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ne eblis Åargi liston el aplikaĵovendejo"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "AÅtentiga eraro"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +119,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Konservante..."
@@ -136,16 +135,16 @@ msgstr "malfari"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Forigi"
@@ -165,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Esperanto"
@@ -235,7 +234,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -255,39 +254,39 @@ msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Kunhavigo"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Kapabligi API-on por Kunhavigo"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "Kapabligi ligilojn"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "Kapabligi rekunhavigon"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +309,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Protokolo"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Registronivelo"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Pli"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Pasvorto"
@@ -423,70 +422,82 @@ msgstr "Nova pasvorto"
msgid "Change password"
msgstr "ÅœanÄi la pasvorton"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "RetpoÅto"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Via retpoÅta adreso"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Enigu retpoÅtadreson por kapabligi pasvortan restaÅron"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Lingvo"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Krei"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "DefaÅlta konservejo"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Senlima"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Alia"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Konservejo"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "DefaÅlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 6a84048239..ae0cd9b839 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 9c9f16c7a6..79e7618ee7 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,13 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# msoko <sokolovitch@yahoo.com>, 2013
+# felix.liberio <felix.liberio@gmail.com>, 2013
+# Javierkaiser <javierkaiser@gmail.com>, 2012
+# Javier Llorente <javier@opensuse.org>, 2012
+# juanman <juanma@kde.org.ar>, 2013
+# juanman <juanma@kde.org.ar>, 2011-2013
+# malmirk <malmirk@gmail.com>, 2012
+# oSiNaReF <>, 2012
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012
+# rodrigo.calvo <rodrigo.calvo@gmail.com>, 2012
+# Romain DEP. <rom1dep@gmail.com>, 2011
+# Rubén Trujillo <rubentrf@gmail.com>, 2012
+# xsergiolpx <sergioballesterossolanas@gmail.com>, 2011-2012
+# scambra <sergio@entrecables.com>, 2012
+# msvladimir <vladimirmartinezsierra@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 18:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -244,7 +257,7 @@ msgstr "El tipo de objeto no se ha especificado."
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr "Error"
+msgstr "Fallo"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
@@ -397,27 +410,24 @@ msgstr "Reiniciar contraseña de ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Utiliza el siguiente enlace para restablecer tu contraseña: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su spam / carpetas no deseados. <br> Si no está allà pregunte a su administrador local."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Petición ha fallado! <br> ¿Usted asegúrese que su dirección de correo electrónico / nombre de usuario estaba justo?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Recibirás un enlace por correo electrónico para restablecer tu contraseña"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Email de reconfiguración enviado."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Pedido fallado!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
#: templates/login.php:19
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Solicitar restablecimiento"
@@ -451,7 +461,7 @@ msgstr "Aplicaciones"
#: strings.php:8
msgid "Admin"
-msgstr "Administración"
+msgstr "Administrador"
#: strings.php:9
msgid "Help"
@@ -471,7 +481,7 @@ msgstr "Editar categorÃas"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "Agregar"
+msgstr "Añadir"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -559,14 +569,9 @@ msgstr "Completar la instalación"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "Servicios web bajo su control"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "servicios web bajo tu control"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Salir"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index cbb83952dd..711f2bc086 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,12 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
+# <davidlopez.david@gmail.com>, 2013.
+# <devianpctek@gmail.com>, 2012.
+# Javier Llorente <javier@opensuse.org>, 2012.
+# <juanma@kde.org.ar>, 2013.
+# <juanma@kde.org.ar>, 2012-2013.
+# <karvayoEdgar@gmail.com>, 2013.
+# Ricardo A. Hermosilla Carrillo <ra.hermosillac@gmail.com>, 2013.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
+# <sergioballesterossolanas@gmail.com>, 2013.
+# <sergioballesterossolanas@gmail.com>, 2011-2012.
+# <sergio@entrecables.com>, 2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -33,11 +47,11 @@ msgstr "No se puede renombrar el archivo"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr "No se subió ningún archivo. Error desconocido"
+msgstr "Fallo no se subió el fichero"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "No hay ningún error, el archivo se ha subido con éxito"
+msgstr "No se ha producido ningún error, el archivo se ha subido con éxito"
#: ajax/upload.php:27
msgid ""
@@ -48,11 +62,11 @@ msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la varia
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
+msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "El archivo se ha subido parcialmente"
+msgstr "El archivo que intentas subir solo se subió parcialmente"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -60,7 +74,7 @@ msgstr "No se ha subido ningún archivo"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Falta la carpeta temporal"
+msgstr "Falta un directorio temporal"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +92,21 @@ msgstr "Directorio invalido."
msgid "Files"
msgstr "Archivos"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Compartir"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Eliminar"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Renombrar"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "Pendientes"
+msgstr "Pendiente"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -164,7 +174,7 @@ msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Imposible subir su archivo, es un directorio o tiene 0 bytes"
+msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
#: js/files.js:272
msgid "Not enough space available"
@@ -293,11 +303,11 @@ msgstr "Descargar"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "No compartir"
+msgstr "Dejar de compartir"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "bida demasido grande"
+msgstr "El archivo es demasiado grande"
#: templates/index.php:110
msgid ""
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index b2a20b26ea..3300c20e3c 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Felix Liberio <felix.liberio@gmail.com>, 2013.
+# <juanma@kde.org.ar>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 3160441fa9..57448b496c 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
+# Javier Llorente <javier@opensuse.org>, 2012.
+# Marcos <djoser.horus@gmail.com>, 2013.
+# <pedro.navia@etecsa.cu>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +42,19 @@ msgstr "Por favor , proporcione un secreto y una contraseña válida de la app D
msgid "Error configuring Google Drive storage"
msgstr "Error configurando el almacenamiento de Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Almacenamiento externo"
@@ -104,7 +102,7 @@ msgstr "Usuarios"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr "Eliminar"
+msgstr "Eliiminar"
#: templates/settings.php:129
msgid "Enable User External Storage"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index dde7058914..8f976d5650 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
+# <pedro.navia@etecsa.cu>, 2012.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 85d553be40..6467cca481 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sergioballesterossolanas@gmail.com>, 2013.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 5fc70f6e2a..61295e5517 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Javier Llorente <javier@opensuse.org>, 2012.
+# <juanma@kde.org.ar>, 2012.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
+# <sergio@entrecables.com>, 2012.
+# vicente rmz <vicentevrl@hotmail.com>, 2013.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index a15c993cab..a30ce7986e 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# juanman <juanma@kde.org.ar>, 2013
+# juanman <juanma@kde.org.ar>, 2012
+# Marcos <djoser.horus@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012
+# Ricardo Hermosilla <ra.hermosillac@gmail.com>, 2013
+# Rubén Trujillo <rubentrf@gmail.com>, 2012
+# scambra <sergio@entrecables.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +121,72 @@ msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
msgid "%s set the database host."
msgstr "%s ingresar el host de la base de datos."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Tiene que ingresar una cuenta existente o la del administrador."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Usuario y/o contraseña de Oracle no válidos"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Usuario y/o contraseña de MySQL no válidos"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Comando infractor: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Usuario MySQL '%s'@'localhost' ya existe."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Eliminar este usuario de MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuario MySQL '%s'@'%%' ya existe"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Eliminar este usuario de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Usuario y/o contraseña de MS SQL no válidos: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalación</a>."
@@ -220,7 +228,7 @@ msgstr "hace %d dÃas"
#: template.php:121
msgid "last month"
-msgstr "mes pasado"
+msgstr "este mes"
#: template.php:122
#, php-format
@@ -229,12 +237,25 @@ msgstr "Hace %d meses"
#: template.php:123
msgid "last year"
-msgstr "año pasado"
+msgstr "este año"
#: template.php:124
msgid "years ago"
msgstr "hace años"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s está disponible. Obtén <a href=\"%s\">más información</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "actualizado"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "comprobar actualizaciones está desactivado"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index da16182353..13236df5dc 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,14 +3,31 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# scambra <sergio@programatica.es>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2012.
+# Daniel Manterola <daniel_manterola@dfml.cl>, 2013.
+# <davidlopez.david@gmail.com>, 2012.
+# Javier Llorente <javier@opensuse.org>, 2012.
+# <juanma@kde.org.ar>, 2013.
+# <juanma@kde.org.ar>, 2011-2012.
+# Marcos <djoser.horus@gmail.com>, 2013.
+# <monty_2731@hotmail.com>, 2011.
+# oSiNaReF <>, 2012.
+# <pedro.navia@etecsa.cu>, 2013.
+# <pggx999@gmail.com>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
+# Ricardo A. Hermosilla Carrillo <ra.hermosillac@gmail.com>, 2013.
+# <rodrigo.calvo@gmail.com>, 2012.
+# <rom1dep@gmail.com>, 2011.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
+# <sergioballesterossolanas@gmail.com>, 2011-2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 09:30+0000\n"
-"Last-Translator: scambra <sergio@programatica.es>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +39,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Error de autenticación"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Su nombre fue cambiado."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Incapaz de cambiar el nombre"
@@ -69,7 +82,7 @@ msgstr "Idioma cambiado"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Petición no válida"
+msgstr "Solicitud no válida"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -99,7 +112,7 @@ msgstr "Desactivar"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Habilitar"
+msgstr "Activar"
#: js/apps.js:55
msgid "Please wait...."
@@ -121,7 +134,7 @@ msgstr "Error mientras se actualizaba"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Guardando..."
@@ -137,16 +150,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "No se puede quitar el usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupo admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Eliminar"
@@ -166,7 +179,7 @@ msgstr "Error al crear usuario"
msgid "A valid password must be provided"
msgstr "Se debe usar una contraseña valida"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Castellano"
@@ -317,19 +330,19 @@ msgstr "Historial"
msgid "Log level"
msgstr "Nivel de Historial"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Más"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +413,7 @@ msgstr "Obtener las apps para sincronizar sus archivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar asistente para iniciar otra vez"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Contraseña"
@@ -418,76 +431,88 @@ msgstr "Contraseña actual"
#: templates/personal.php:42
msgid "New password"
-msgstr "Nueva contraseña"
+msgstr "Nueva contraseña:"
#: templates/personal.php:44
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nombre a mostrar"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "E-mail"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Su nombre fue cambiado"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Incapaz de cambiar su nombre"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Cambiar nombre"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Tu dirección de correo"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ayúdanos a traducir"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nombre de usuario"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Almacenamiento Predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Otro"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
-msgstr "Almacenamiento"
+msgstr "Alamacenamiento"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "Cambiar nombre a mostrar"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 7c1c605a2a..3043a99312 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Felix Liberio <felix.liberio@gmail.com>, 2013.
+# Javier Llorente <javier@opensuse.org>, 2012.
+# <juanma@kde.org.ar>, 2012.
+# <manudeloz86@gmail.com>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012-2013.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
+# <sergioballesterossolanas@gmail.com>, 2012.
+# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 1e5bebb11e..7a134d06ce 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# CJTess <claudio.tessone@gmail.com>, 2013.
+# <claudio.tessone@gmail.com>, 2012-2013.
+# <javierkaiser@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +76,7 @@ msgstr "Error al agregar %s a favoritos. "
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "No se seleccionaron categorÃas para borrar."
+msgstr "No hay categorÃas seleccionadas para borrar."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -110,55 +113,55 @@ msgstr "Sábado"
#: js/config.php:45
msgid "January"
-msgstr "enero"
+msgstr "Enero"
#: js/config.php:46
msgid "February"
-msgstr "febrero"
+msgstr "Febrero"
#: js/config.php:47
msgid "March"
-msgstr "marzo"
+msgstr "Marzo"
#: js/config.php:48
msgid "April"
-msgstr "abril"
+msgstr "Abril"
#: js/config.php:49
msgid "May"
-msgstr "mayo"
+msgstr "Mayo"
#: js/config.php:50
msgid "June"
-msgstr "junio"
+msgstr "Junio"
#: js/config.php:51
msgid "July"
-msgstr "julio"
+msgstr "Julio"
#: js/config.php:52
msgid "August"
-msgstr "agosto"
+msgstr "Agosto"
#: js/config.php:53
msgid "September"
-msgstr "septiembre"
+msgstr "Septiembre"
#: js/config.php:54
msgid "October"
-msgstr "octubre"
+msgstr "Octubre"
#: js/config.php:55
msgid "November"
-msgstr "noviembre"
+msgstr "Noviembre"
#: js/config.php:56
msgid "December"
-msgstr "diciembre"
+msgstr "Diciembre"
#: js/js.js:286
msgid "Settings"
-msgstr "Configuración"
+msgstr "Ajustes"
#: js/js.js:718
msgid "seconds ago"
@@ -174,7 +177,7 @@ msgstr "hace {minutes} minutos"
#: js/js.js:721
msgid "1 hour ago"
-msgstr "1 hora atrás"
+msgstr "Hace 1 hora"
#: js/js.js:722
msgid "{hours} hours ago"
@@ -293,7 +296,7 @@ msgstr "Compartir con link"
msgid "Password protect"
msgstr "Proteger con contraseña "
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Contraseña"
@@ -331,7 +334,7 @@ msgstr "Compartido en {item} con {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "Dejar de compartir"
+msgstr "Remover compartir"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +399,24 @@ msgstr "Restablecer contraseña de ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Usá este enlace para restablecer tu contraseña: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Reiniciar envÃo de email."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Error en el pedido!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Solicitar restablecimiento"
@@ -430,7 +430,7 @@ msgstr "A la página de inicio de sesión"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "Nueva contraseña:"
+msgstr "Nueva contraseña"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -450,7 +450,7 @@ msgstr "Aplicaciones"
#: strings.php:8
msgid "Admin"
-msgstr "Administración"
+msgstr "Administrador"
#: strings.php:9
msgid "Help"
@@ -522,80 +522,75 @@ msgstr "Avanzado"
msgid "Data folder"
msgstr "Directorio de almacenamiento"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "se utilizarán"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Completar la instalación"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "servicios web controlados por vos"
+msgstr "servicios web sobre los que tenés control"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Cerrar la sesión"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "¡El inicio de sesión automático fue rechazado!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "¿Perdiste tu contraseña?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "recordame"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Nombre alternativos de usuarios"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 76340a8c72..cd36082331 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -3,13 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013
+# cjtess <claudio.tessone@gmail.com>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2012-2013
+# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
+"PO-Revision-Date: 2013-04-19 09:10+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
@@ -37,7 +41,7 @@ msgstr "El archivo no fue subido. Error desconocido"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "No hay errores, el archivo fue subido con éxito"
+msgstr "No se han producido errores, el archivo se ha subido con éxito"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +52,19 @@ msgstr "El archivo que intentás subir excede el tamaño definido por upload_max
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML"
+msgstr "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "El archivo fue subido parcialmente"
+msgstr "El archivo que intentás subir solo se subió parcialmente"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "No se subió ningún archivo "
+msgstr "El archivo no fue subido"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Error en la carpera temporal"
+msgstr "Falta un directorio temporal"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +82,21 @@ msgstr "Directorio invalido."
msgid "Files"
msgstr "Archivos"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Compartir"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Borrar de manera permanente"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Borrar"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Cambiar nombre"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "Pendientes"
+msgstr "Pendiente"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -297,7 +297,7 @@ msgstr "Dejar de compartir"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "El tamaño del archivo que querés subir es demasiado grande"
+msgstr "El archivo es demasiado grande"
#: templates/index.php:110
msgid ""
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 08c82d2bc8..e51d601c61 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# CJTess <claudio.tessone@gmail.com>, 2013.
+# <claudio.tessone@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index f2b512a503..a5b2316b32 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
+# <claudio.tessone@gmail.com>, 2012.
+# Julia <juliassantos5@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Por favor, proporcioná un secreto y una contraseña válida para la apl
msgid "Error configuring Google Drive storage"
msgstr "Error al configurar el almacenamiento de Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Almacenamiento externo"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 75310dddcc..bf0799a222 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <claudio.tessone@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 3912933c0c..b3f0b5a9fd 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# CJTess <claudio.tessone@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 623368fabe..b880bde3d9 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# CJTess <claudio.tessone@gmail.com>, 2013.
+# <claudio.tessone@gmail.com>, 2012.
+# Julia <juliassantos5@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d22bcbdee2..20c71ecabd 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2012
+# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +31,7 @@ msgstr "Personal"
#: app.php:373
msgid "Settings"
-msgstr "Configuración"
+msgstr "Ajustes"
#: app.php:385
msgid "Users"
@@ -67,7 +71,7 @@ msgstr "La aplicación no está habilitada"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Error al autenticar"
+msgstr "Error de autenticación"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,79 +117,79 @@ msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
msgid "%s set the database host."
msgstr "%s Especifique la dirección de la Base de Datos"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Debe ingresar una cuenta existente o el administrador"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "El nombre de usuario y contraseña no son válidos"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Usuario y/o contraseña MySQL no válido"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "El comando no comprendido es: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Usuario MySQL '%s'@'localhost' ya existente"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Borrar este usuario de MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuario MySQL '%s'@'%%' ya existente"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Borrar este usuario de MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tu servidor web no está configurado todavÃa para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, comprobá nuevamente la <a href='%s'>guÃa de instalación</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "segundos atrás"
+msgstr "hace unos segundos"
#: template.php:114
msgid "1 minute ago"
@@ -220,7 +224,7 @@ msgstr "hace %d dÃas"
#: template.php:121
msgid "last month"
-msgstr "el mes pasado"
+msgstr "este mes"
#: template.php:122
#, php-format
@@ -229,11 +233,24 @@ msgstr "%d meses atrás"
#: template.php:123
msgid "last year"
-msgstr "el año pasado"
+msgstr "este año"
#: template.php:124
msgid "years ago"
-msgstr "años atrás"
+msgstr "hace años"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s está disponible. Conseguà <a href=\"%s\">más información</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "actualizado"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "comprobar actualizaciones está desactivado"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 7e2eabe42c..6d8d518077 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
+# CJTess <claudio.tessone@gmail.com>, 2013.
+# <claudio.tessone@gmail.com>, 2012.
+# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +25,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Error al autenticar"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "No fue posible cambiar el nombre mostrado"
@@ -68,7 +68,7 @@ msgstr "Idioma cambiado"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Pedido no válido"
+msgstr "Solicitud no válida"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +120,7 @@ msgstr "Error al actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Guardando..."
@@ -136,16 +136,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible remover usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Borrar"
@@ -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:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Castellano (Argentina)"
@@ -316,19 +316,19 @@ msgstr "Log"
msgid "Log level"
msgstr "Nivel de Log"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Más"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Obtené aplicaciones para sincronizar tus archivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar de nuevo el asistente de primera ejecución"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Contraseña"
@@ -423,70 +423,82 @@ msgstr "Nueva contraseña:"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nombre a mostrar"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Correo Electrónico"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "El nombre mostrado fue cambiado"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "No fue posible cambiar tu nombre"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Cambiar nombre"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Tu dirección de e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Escribà una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nombre de "
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Almacenamiento Predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "Otros"
+msgstr "Otro"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "Cambiar el nombre que se muestra"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index e5394097ae..a0f13250f4 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
+# CJTess <claudio.tessone@gmail.com>, 2013.
+# <claudio.tessone@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 79e459216a..73d7534b61 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -294,7 +295,7 @@ msgstr "Jaga lingiga"
msgid "Password protect"
msgstr "Parooliga kaitstud"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Parool"
@@ -397,27 +398,24 @@ msgstr "ownCloud parooli taastamine"
msgid "Use the following link to reset your password: {link}"
msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Taastamise e-kiri on saadetud."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Päring ebaõnnestus!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Kasutajanimi"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Päringu taastamine"
@@ -439,7 +437,7 @@ msgstr "Nulli parool"
#: strings.php:5
msgid "Personal"
-msgstr "Isiklik"
+msgstr "isiklik"
#: strings.php:6
msgid "Users"
@@ -447,7 +445,7 @@ msgstr "Kasutajad"
#: strings.php:7
msgid "Apps"
-msgstr "Rakendused"
+msgstr "Programmid"
#: strings.php:8
msgid "Admin"
@@ -467,7 +465,7 @@ msgstr "Pilve ei leitud"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Muuda kategooriat"
+msgstr "Muuda kategooriaid"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -517,86 +515,81 @@ msgstr "Loo <strong>admini konto</strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr "Täpsem"
+msgstr "Lisavalikud"
#: templates/installation.php:64
msgid "Data folder"
msgstr "Andmete kaust"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Seadista andmebaasi"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "kasutatakse"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Andmebaasi kasutaja"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Andmebaasi parool"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Andmebasi nimi"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Andmebaasi tabeliruum"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Andmebaasi host"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Lõpeta seadistamine"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "veebitenused sinu kontrolli all"
+msgstr "veebiteenused sinu kontrolli all"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Logi välja"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automaatne sisselogimine lükati tagasi!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Kaotasid oma parooli?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "pea meeles"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Logi sisse"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternatiivsed meldimised"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 2095a86eb7..9bfc400f49 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dagor.vint@hotmail.com>, 2012.
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +40,7 @@ msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Ühtegi tõrget polnud, fail on üles laetud"
+msgstr "Ühtegi viga pole, fail on üles laetud"
#: ajax/upload.php:27
msgid ""
@@ -48,7 +51,7 @@ msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_fi
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
+msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -78,19 +81,15 @@ msgstr "Vigane kaust."
msgid "Files"
msgstr "Failid"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Jaga"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Kustuta jäädavalt"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Kustuta"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "ümber"
@@ -164,7 +163,7 @@ msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suu
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti"
+msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
#: js/files.js:272
msgid "Not enough space available"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 9850a24ab4..8487c07b9f 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:12+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index bcacfde3df..23cd4c8a18 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:20+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,25 +39,18 @@ msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
msgid "Error configuring Google Drive storage"
msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr "<b>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
-
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Hoiatus:</b> PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada."
+msgstr "<b>Hoiatus:</b> FTP tugi puudub PHP paigalduses. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index a698beda26..5f470a04c3 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:07+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 9e8889d3a7..46f8a4c56d 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:11+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 570e7d1253..de58702159 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:20+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,4 +56,4 @@ msgstr "Versioonid"
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
+msgstr "Taasta fail varasemale versioonile klikkides \"Revert\" nupule"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 6cca7168ed..19268960f2 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -97,7 +98,7 @@ msgstr "Määra admini parool."
#: setup.php:55
#, php-format
msgid "%s enter the database username."
-msgstr "%s sisesta andmebaasi kasutajatunnus."
+msgstr "%s sisesta andmebaasi kasutajatunnus"
#: setup.php:58
#, php-format
@@ -114,72 +115,72 @@ msgstr "%s punktide kasutamine andmebaasi nimes pole lubatud"
msgid "%s set the database host."
msgstr "%s määra andmebaasi server."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Sisesta kas juba olemasolev konto või administrator."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Andmebaasi viga: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Tõrkuv käsk oli: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Kustuta see kasutaja MySQL-ist"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Kustuta see kasutaja MySQL-ist."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
@@ -221,7 +222,7 @@ msgstr "%d päeva tagasi"
#: template.php:121
msgid "last month"
-msgstr "viimasel kuul"
+msgstr "eelmisel kuul"
#: template.php:122
#, php-format
@@ -230,12 +231,25 @@ msgstr "%d kuud tagasi"
#: template.php:123
msgid "last year"
-msgstr "viimasel aastal"
+msgstr "eelmisel aastal"
#: template.php:124
msgid "years ago"
msgstr "aastat tagasi"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "ajakohane"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "uuenduste kontrollimine on välja lülitatud"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 2ce1db61d3..3532232094 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <icewind1991@gmail.com>, 2012.
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Autentimise viga"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Sinu kuvatav nimi on muudetud."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Ei saa muuta kuvatavat nime"
@@ -98,7 +97,7 @@ msgstr "Lülita välja"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Luba"
+msgstr "Lülita sisse"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +119,7 @@ msgstr "Viga rakenduse uuendamisel"
msgid "Updated"
msgstr "Uuendatud"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Salvestamine..."
@@ -136,16 +135,16 @@ msgstr "tagasi"
msgid "Unable to remove user"
msgstr "Ei suuda kustutada kasutajat"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupid"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupi admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Kustuta"
@@ -165,7 +164,7 @@ msgstr "Viga kasutaja loomisel"
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Eesti"
@@ -316,19 +315,19 @@ msgstr "Logi"
msgid "Log level"
msgstr "Logi tase"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Rohkem"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr "Hangi rakendusi failide sünkroniseerimiseks"
msgid "Show First Run Wizard again"
msgstr "Näita veelkord Esmase Käivituse Juhendajat"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Parool"
@@ -423,70 +422,82 @@ msgstr "Uus parool"
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Näidatav nimi"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Sinu kuvatav nimi muutus"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Ei suuda muuta kuvatavat nime"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Muuda näidatavat nime"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Sinu e-posti aadress"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Keel"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Kasutajanimi"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Lisa"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Vaikimisi maht"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Piiramatult"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Muu"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Maht"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "muuda näidatavat nime"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "määra uus parool"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 8b0745ed62..9da3698683 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index b1ac57ddbf..a25893ddd1 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
-# Rivo Zängov <eraser@eraser.ee>, 2012-2013
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
+# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 19:19+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 7f5af267bd..6fa4ebaaf0 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+# Piarres Beobide <pi@beobide.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +297,7 @@ msgstr "Elkarbanatu lotura batekin"
msgid "Password protect"
msgstr "Babestu pasahitzarekin"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Pasahitza"
@@ -396,27 +400,24 @@ msgstr "ownCloud-en pasahitza berrezarri"
msgid "Use the following link to reset your password: {link}"
msgstr "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Berrezartzeko eposta bidali da."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Eskariak huts egin du!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Erabiltzaile izena"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Eskaera berrezarri da"
@@ -450,7 +451,7 @@ msgstr "Aplikazioak"
#: strings.php:8
msgid "Admin"
-msgstr "Admin"
+msgstr "Kudeatzailea"
#: strings.php:9
msgid "Help"
@@ -522,37 +523,37 @@ msgstr "Aurreratua"
msgid "Data folder"
msgstr "Datuen karpeta"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfiguratu datu basea"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "erabiliko da"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Datubasearen erabiltzailea"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Datubasearen pasahitza"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Datubasearen izena"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Datu basearen taula-lekua"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Datubasearen hostalaria"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Bukatu konfigurazioa"
@@ -560,42 +561,37 @@ msgstr "Bukatu konfigurazioa"
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Saioa bukatu"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Saio hasiera automatikoa ez onartuta!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Galdu duzu pasahitza?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "gogoratu"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Hasi saioa"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Beste erabiltzaile izenak"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 61fa18f263..0f710284f4 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+# Piarres Beobide <pi@beobide.net>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +41,7 @@ msgstr "Ez da fitxategirik igo. Errore ezezaguna"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Ez da errorerik egon, fitxategia ongi igo da"
+msgstr "Ez da arazorik izan, fitxategia ongi igo da"
#: ajax/upload.php:27
msgid ""
@@ -48,11 +52,11 @@ msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize m
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
+msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
+msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -60,7 +64,7 @@ msgstr "Ez da fitxategirik igo"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Aldi bateko karpeta falta da"
+msgstr "Aldi baterako karpeta falta da"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +82,15 @@ msgstr "Baliogabeko karpeta."
msgid "Files"
msgstr "Fitxategiak"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Elkarbanatu"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Ezabatu betirako"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Ezabatu"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Berrizendatu"
@@ -132,7 +132,7 @@ msgstr "fitxategi 1 igotzen"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "fitxategiak igotzen"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +164,7 @@ msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako"
+msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
#: js/files.js:272
msgid "Not enough space available"
@@ -297,7 +297,7 @@ msgstr "Ez elkarbanatu"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Igoera handiegia da"
+msgstr "Igotakoa handiegia da"
#: templates/index.php:110
msgid ""
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 40ebdc5fdf..eea7795bbc 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "Baztertu hurrengo fitxategi motak enkriptatzetik:"
#: templates/settings.php:12
msgid "None"
-msgstr "Ezer"
+msgstr "Bat ere ez"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index f6059f3288..4cb0843ae5 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
msgid "Error configuring Google Drive storage"
msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Kanpoko Biltegiratzea"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index ca0772183c..89c6272ac7 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index d86ad26b2e..0aea8466bd 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index c7a497b929..7fdbf14c0d 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 2319ead910..912f19f241 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +69,7 @@ msgstr "Aplikazioa ez dago gaituta"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Autentifikazio errorea"
+msgstr "Autentikazio errorea"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,79 +115,79 @@ msgstr "%s ezin duzu punturik erabili datu basearen izenean."
msgid "%s set the database host."
msgstr "%s sartu datu basearen hostalaria."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB errorea: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Errorea komando honek sortu du: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Ezabatu erabiltzaile hau MySQLtik"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Ezabatu erabiltzaile hau MySQLtik."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "segundu"
+msgstr "orain dela segundu batzuk"
#: template.php:114
msgid "1 minute ago"
@@ -220,7 +222,7 @@ msgstr "orain dela %d egun"
#: template.php:121
msgid "last month"
-msgstr "joan den hilabetean"
+msgstr "joan den hilabetea"
#: template.php:122
#, php-format
@@ -229,11 +231,24 @@ msgstr "orain dela %d hilabete"
#: template.php:123
msgid "last year"
-msgstr "joan den urtean"
+msgstr "joan den urtea"
#: template.php:124
msgid "years ago"
-msgstr "urte"
+msgstr "orain dela urte batzuk"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s eskuragarri dago. Lortu <a href=\"%s\">informazio gehiago</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "eguneratuta"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "eguneraketen egiaztapena ez dago gaituta"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 229680c871..4f70111c6e 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
+# Asier Urio Larrea <asieriko@gmail.com>, 2011.
+# Piarres Beobide <pi@beobide.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +25,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ezin izan da App Dendatik zerrenda kargatu"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Autentifikazio errorea"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Ezin izan da bistaratze izena aldatu"
@@ -68,7 +68,7 @@ msgstr "Hizkuntza aldatuta"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Baliogabeko eskaera"
+msgstr "Baliogabeko eskaria"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +120,7 @@ msgstr "Errorea aplikazioa eguneratzen zen bitartean"
msgid "Updated"
msgstr "Eguneratuta"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Gordetzen..."
@@ -136,16 +136,16 @@ msgstr "desegin"
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Ezabatu"
@@ -165,7 +165,7 @@ msgstr "Errore bat egon da erabiltzailea sortzean"
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Euskera"
@@ -316,19 +316,19 @@ msgstr "Egunkaria"
msgid "Log level"
msgstr "Erregistro maila"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Gehiago"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Gutxiago"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
msgid "Show First Run Wizard again"
msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Pasahitza"
@@ -423,70 +423,82 @@ msgstr "Pasahitz berria"
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Bistaratze Izena"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "E-posta"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Zure bistaratze izena aldatu da"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Ezin izan da zure bistaratze izena aldatu"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Aldatu bistaratze izena"
#: templates/personal.php:70
+msgid "Email"
+msgstr "E-Posta"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Zure e-posta"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Hizkuntza"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Sarrera Izena"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Sortu"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Lehenetsitako Biltegiratzea"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Mugarik gabe"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "Bestelakoa"
+msgstr "Besteak"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Biltegiratzea"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "aldatu bistaratze izena"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "ezarri pasahitz berria"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 396651c963..5dbd26541b 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2013.
+# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 5e282fc91e..9178afa906 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hossein nag <h.sname@yahoo.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -259,7 +261,7 @@ msgstr "اشتراک گذاشته شده"
#: js/share.js:90
msgid "Share"
-msgstr "اشتراک‌گذاری"
+msgstr "اشتراک‌گزاری"
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
@@ -293,7 +295,7 @@ msgstr "به اشتراک گذاشتن با پیوند"
msgid "Password protect"
msgstr "نگهداری کردن رمز عبور"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "گذرواژه"
@@ -396,27 +398,24 @@ msgstr "پسورد ابرهای شما تغییرکرد"
msgid "Use the following link to reset your password: {link}"
msgstr "از لینک زیر جهت دوباره سازی پسورد استÙاده کنید :\n{link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "شما یک نامه الکترونیکی Øاوی یک لینک جهت بازسازی گذرواژه دریاÙت خواهید کرد."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
-msgstr "نام کاربری"
+msgstr "شناسه"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "درخواست دوباره سازی"
@@ -442,11 +441,11 @@ msgstr "شخصی"
#: strings.php:6
msgid "Users"
-msgstr "کاربران"
+msgstr "کاربر ها"
#: strings.php:7
msgid "Apps"
-msgstr " برنامه ها"
+msgstr "برنامه"
#: strings.php:8
msgid "Admin"
@@ -454,7 +453,7 @@ msgstr "مدیر"
#: strings.php:9
msgid "Help"
-msgstr "راه‌نما"
+msgstr "Ú©Ù…Ú©"
#: templates/403.php:12
msgid "Access forbidden"
@@ -466,7 +465,7 @@ msgstr "پیدا نشد"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "ویرایش گروه"
+msgstr "ویرایش گروه ها"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -516,86 +515,81 @@ msgstr "لطÙا یک <strong> شناسه برای مدیر</strong> بسازی
#: templates/installation.php:62
msgid "Advanced"
-msgstr "پیشرÙته"
+msgstr "ØرÙÙ‡ ای"
#: templates/installation.php:64
msgid "Data folder"
msgstr "پوشه اطلاعاتی"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "پایگاه داده برنامه ریزی شدند"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "استÙاده خواهد شد"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "شناسه پایگاه داده"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "پسورد پایگاه داده"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "نام پایگاه داده"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "جدول پایگاه داده"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "هاست پایگاه داده"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "اتمام نصب"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "سرویس های تØت وب در کنترل شما"
+msgstr "سرویس وب تØت کنترل شما"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "خروج"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "ورود به سیستم اتوماتیک ردشد!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "اگر شما اخیرا رمزعبور را تغییر نداده اید، Øساب شما در معرض خطر Ù…ÛŒ باشد !"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "لطÙا رمز عبور خود را تغییر دهید تا مجددا Øساب شما در امان باشد."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "بیاد آوری"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "ورود"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "ورود متناوب"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 003b3ef9cc..6e2cacffc3 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hossein nag <h.sname@yahoo.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
+# vahid chakoshy <vchakoshy@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +41,7 @@ msgstr "هیچ Ùایلی آپلود نشد.خطای ناشناس"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "هیچ خطایی نیست بارگذاری پرونده موÙقیت آمیز بود"
+msgstr "هیچ خطایی وجود ندارد Ùایل با موÙقیت بار گذاری شد"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +52,19 @@ msgstr "پرونده آپلود شده بیش ازدستور ماکزیمم_Ø
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Øداکثر Øجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
+msgstr "Øداکثر Øجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "پرونده بارگذاری شده Ùقط تاØدودی بارگذاری شده"
+msgstr "مقدار Ú©Ù…ÛŒ از Ùایل بارگذاری شده"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "هیچ پروندهای بارگذاری نشده"
+msgstr "هیچ Ùایلی بارگذاری نشده"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "یک پوشه موقت گم شده"
+msgstr "یک پوشه موقت گم شده است"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -76,21 +80,17 @@ msgstr "Ùهرست راهنما نامعتبر Ù…ÛŒ باشد."
#: appinfo/app.php:12
msgid "Files"
-msgstr "پرونده‌ها"
+msgstr "Ùایل ها"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "اشتراک‌گذاری"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Øذ٠قطعی"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "ØØ°Ù"
+msgstr "پاک کردن"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "تغییرنام"
@@ -201,7 +201,7 @@ msgstr "اندازه"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "تاریخ"
+msgstr "تغییر یاÙته"
#: js/files.js:893
msgid "1 folder"
@@ -221,7 +221,7 @@ msgstr "{ شمار } Ùایل ها"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "بارگزاری"
+msgstr "بارگذاری"
#: templates/admin.php:5
msgid "File handling"
@@ -289,7 +289,7 @@ msgstr "اینجا هیچ چیز نیست."
#: templates/index.php:76
msgid "Download"
-msgstr "دانلود"
+msgstr "بارگیری"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
@@ -297,7 +297,7 @@ msgstr "لغو اشتراک"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "سایز Ùایل برای آپلود زیاد است(Ù….تنظیمات در php.ini)"
+msgstr "Øجم بارگذاری بسیار زیاد است"
#: templates/index.php:110
msgid ""
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index fef3cfd192..a4b3d25d08 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <basir.jafarzadeh@gmail.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index d9f3a99ddf..b881ebe558 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "ØاÙظه خارجی"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9bc4ac8a32..c481470728 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index b513c23be8..56b1199bd6 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 15fe4b1b74..2e38afda4e 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 41bd3beeae..db4d2de1ce 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Reza Asadi <amirreza.asadi@live.com>, 2013
+# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +116,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اØتمالاً وب سرور شما طوری تنظیم نشده است Ú©Ù‡ اجازه ÛŒ همگام سازی Ùایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار اÙتاده است."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "لطÙاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
@@ -235,6 +238,19 @@ msgstr "سال قبل"
msgid "years ago"
msgstr "سال‌های قبل"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index a962359623..a39dc9e68b 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
+# <basir.jafarzadeh@gmail.com>, 2012.
+# Hossein nag <h.sname@yahoo.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
+# <tamass4116@gmail.com>, 2012.
+# vahid chakoshy <vchakoshy@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +27,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "قادر به بارگذاری لیست از Ùروشگاه اپ نیستم"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "خطا در اعتبار سنجی"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "امکان تغییر نام نمایشی شما وجود ندارد"
@@ -68,7 +70,7 @@ msgstr "زبان تغییر کرد"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "درخواست نامعتبر"
+msgstr "درخواست غیر قابل قبول"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,9 +122,9 @@ msgstr "خطا در هنگام بهنگام سازی برنامه"
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "در Øال ذخیره سازی..."
+msgstr "درØال ذخیره ..."
#: js/users.js:43
msgid "deleted"
@@ -136,18 +138,18 @@ msgstr "بازگشت"
msgid "Unable to remove user"
msgstr "Øذ٠کاربر امکان پذیر نیست"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "گروه ها"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "ØØ°Ù"
+msgstr "پاک کردن"
#: js/users.js:262
msgid "add group"
@@ -165,7 +167,7 @@ msgstr "خطا در ایجاد کاربر"
msgid "A valid password must be provided"
msgstr "رمز عبور صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -310,25 +312,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "کارنامه"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "بیش‌تر"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "کم‌تر"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +401,7 @@ msgstr "برنامه ها را دریاÙت کنید تا Ùایل هایتان
msgid "Show First Run Wizard again"
msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "گذرواژه"
@@ -423,70 +425,82 @@ msgstr "گذرواژه جدید"
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "نام نمایشی"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "ایمیل"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "نام نمایشی شما تغییر یاÙت"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "امکان تغییر نام نمایشی شما وجود ندارد"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "تغییر نام نمایشی"
#: templates/personal.php:70
+msgid "Email"
+msgstr "پست الکترونیکی"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "پست الکترونیکی شما"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "پست الکترونیکی را پرکنید تا بازیابی گذرواژه Ùعال شود"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "زبان"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت Ùایل خودتان استÙاده کنید"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "نام کاربری"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "ایجاد کردن"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "ذخیره سازی پیش Ùرض"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "نامØدود"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "دیگر"
+msgstr "سایر"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "ØاÙظه"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "تغییر نام نمایشی"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "تنظیم کلمه عبور جدید"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "پیش Ùرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index a5b101124f..be344210e5 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +127,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "گذرواژه"
+msgstr "رمز عبور"
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 03746586e2..4a0b4df42e 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Käyttäjätunnus"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index af389b21f9..ccb82381a2 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index 93a7b3b4ed..8797335cbc 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 36d65066e3..80f0f53b37 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -3,13 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# <ari.takalo@iki.fi>, 2012.
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Johannes Korpela <>, 2012.
+# Pekka Sutela <pekka.sutela@gmail.com>, 2012.
+# <tehoratopato@gmail.com>, 2012.
+# <tscooter@hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -83,79 +89,79 @@ msgstr "Virhe poistaessa kohdetta %s suosikeista."
#: js/config.php:34
msgid "Sunday"
-msgstr "sunnuntai"
+msgstr "Sunnuntai"
#: js/config.php:35
msgid "Monday"
-msgstr "maanantai"
+msgstr "Maanantai"
#: js/config.php:36
msgid "Tuesday"
-msgstr "tiistai"
+msgstr "Tiistai"
#: js/config.php:37
msgid "Wednesday"
-msgstr "keskiviikko"
+msgstr "Keskiviikko"
#: js/config.php:38
msgid "Thursday"
-msgstr "torstai"
+msgstr "Torstai"
#: js/config.php:39
msgid "Friday"
-msgstr "perjantai"
+msgstr "Perjantai"
#: js/config.php:40
msgid "Saturday"
-msgstr "lauantai"
+msgstr "Lauantai"
#: js/config.php:45
msgid "January"
-msgstr "tammikuu"
+msgstr "Tammikuu"
#: js/config.php:46
msgid "February"
-msgstr "helmikuu"
+msgstr "Helmikuu"
#: js/config.php:47
msgid "March"
-msgstr "maaliskuu"
+msgstr "Maaliskuu"
#: js/config.php:48
msgid "April"
-msgstr "huhtikuu"
+msgstr "Huhtikuu"
#: js/config.php:49
msgid "May"
-msgstr "toukokuu"
+msgstr "Toukokuu"
#: js/config.php:50
msgid "June"
-msgstr "kesäkuu"
+msgstr "Kesäkuu"
#: js/config.php:51
msgid "July"
-msgstr "heinäkuu"
+msgstr "Heinäkuu"
#: js/config.php:52
msgid "August"
-msgstr "elokuu"
+msgstr "Elokuu"
#: js/config.php:53
msgid "September"
-msgstr "syyskuu"
+msgstr "Syyskuu"
#: js/config.php:54
msgid "October"
-msgstr "lokakuu"
+msgstr "Lokakuu"
#: js/config.php:55
msgid "November"
-msgstr "marraskuu"
+msgstr "Marraskuu"
#: js/config.php:56
msgid "December"
-msgstr "joulukuu"
+msgstr "Joulukuu"
#: js/js.js:286
msgid "Settings"
@@ -294,7 +300,7 @@ msgstr "Jaa linkillä"
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Salasana"
@@ -397,27 +403,24 @@ msgstr "ownCloud-salasanan nollaus"
msgid "Use the following link to reset your password: {link}"
msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Salasanan nollausviesti lähetetty."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Pyyntö epäonnistui!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Käyttäjätunnus"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Tilaus lähetetty"
@@ -439,7 +442,7 @@ msgstr "Palauta salasana"
#: strings.php:5
msgid "Personal"
-msgstr "Henkilökohtainen"
+msgstr "Henkilökohtaiset"
#: strings.php:6
msgid "Users"
@@ -451,7 +454,7 @@ msgstr "Sovellukset"
#: strings.php:8
msgid "Admin"
-msgstr "Ylläpitäjä"
+msgstr "Hallinta"
#: strings.php:9
msgid "Help"
@@ -490,7 +493,7 @@ msgstr "Päivitä PHP-asennuksesi käyttääksesi ownCloudia turvallisesti."
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus"
+msgstr ""
#: templates/installation.php:33
msgid ""
@@ -523,37 +526,37 @@ msgstr "Lisäasetukset"
msgid "Data folder"
msgstr "Datakansio"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Muokkaa tietokantaa"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "käytetään"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Tietokannan käyttäjä"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Tietokannan salasana"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Tietokannan nimi"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tietokannan taulukkotila"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Tietokantapalvelin"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Viimeistele asennus"
@@ -561,42 +564,37 @@ msgstr "Viimeistele asennus"
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Kirjaudu ulos"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automaattinen sisäänkirjautuminen hylättiin!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu."
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "muista"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Kirjaudu sisään"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Vaihtoehtoiset kirjautumiset"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 861e5ebe9f..d68085e964 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Johannes Korpela <>, 2012.
+# <tehoratopato@gmail.com>, 2012.
+# <tscooter@hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +47,13 @@ msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:"
+msgstr ""
#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa"
+msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -60,7 +65,7 @@ msgstr "Yhtäkään tiedostoa ei lähetetty"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Tilapäiskansio puuttuu"
+msgstr "Väliaikaiskansiota ei ole olemassa"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +83,15 @@ msgstr "Virheellinen kansio."
msgid "Files"
msgstr "Tiedostot"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Jaa"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Poista pysyvästi"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Poista"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Nimeä uudelleen"
@@ -164,7 +165,7 @@ msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio."
+msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
#: js/files.js:272
msgid "Not enough space available"
@@ -201,7 +202,7 @@ msgstr "Koko"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "Muokattu"
+msgstr "Muutettu"
#: js/files.js:893
msgid "1 folder"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 8e9d79de1f..606ba38b82 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 5063d70911..87b5f4c115 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <ari.takalo@iki.fi>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# <tehoratopato@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
msgid "Error configuring Google Drive storage"
msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan smbclient."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Varoitus:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. FTP-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Varoitus:</b> PHP:n Curl-tuki ei ole käytössä tai sitä ei ole lainkaan asennettu. ownCloudin, WebDAV:in tai Google Driven liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan Curl-tuki käyttöön."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Erillinen tallennusväline"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index dedda4f435..5abc5ffddc 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+# <tehoratopato@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index c076a783a1..6f3b5b2708 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index f29c46f457..1dbda29303 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 4a438cdbf2..187363f2d8 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +68,7 @@ msgstr "Sovellusta ei ole otettu käyttöön"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Tunnistautumisvirhe"
+msgstr "Todennusvirhe"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,72 +114,72 @@ msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Tietokantavirhe: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Pudota tämä käyttäjä MySQL:stä"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Pudota tämä käyttäjä MySQL:stä."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
@@ -235,6 +236,19 @@ msgstr "viime vuonna"
msgid "years ago"
msgstr "vuotta sitten"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s on saatavilla. Lue <a href=\"%s\">lisätietoja</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "ajan tasalla"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "päivitysten tarkistus on pois käytöstä"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 75d1540673..dbaeb19403 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# <tehoratopato@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Tunnistautumisvirhe"
+msgstr "Todennusvirhe"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Näyttönimesi on muutettu."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Näyttönimen muuttaminen epäonnistui"
@@ -121,7 +119,7 @@ msgstr "Virhe sovellusta päivittäessä"
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Tallennetaan..."
@@ -137,16 +135,16 @@ msgstr "kumoa"
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Poista"
@@ -166,7 +164,7 @@ msgstr "Virhe käyttäjää luotaessa"
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_kielen_nimi_"
@@ -317,19 +315,19 @@ msgstr "Loki"
msgid "Log level"
msgstr "Lokitaso"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Enemmän"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Vähemmän"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +398,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Salasana"
@@ -424,70 +422,82 @@ msgstr "Uusi salasana"
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Näyttönimi"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Sähköpostiosoite"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Näyttönimesi muutettiin"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Näyttönimen muuttaminen epäonnistui"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Muuta näyttönimeä"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Sähköposti"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Sähköpostiosoitteesi"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Kieli"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Kirjautumisnimi"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Luo"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Oletustallennustila"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Rajoittamaton"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Muu"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Tallennustila"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "vaihda näyttönimi"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "aseta uusi salasana"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 8cad6d46a1..a72be9f164 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <jarkko.moilanen@want3d.fi>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# <tehoratopato@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 5b8b4cdeb0..07437d6613 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,13 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# plachance <patlachance@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
+# David Basquin <dba@alternalease.fr>, 2013.
+# <dba@alternalease.fr>, 2013.
+# Fabian Lemaître <ptit.boogy@gmail.com>, 2013.
+# <fkhannouf@me.com>, 2012.
+# <florentin.lemoal@gmail.com>, 2012.
+# Guillaume Paumier <guillom.pom@gmail.com>, 2012-2013.
+# <mishka.lazzlo@gmail.com>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+# <nathaplop@gmail.com>, 2012.
+# <nicolas@shivaserv.fr>, 2012.
+# Robert Di Rosa <>, 2013.
+# <rom1dep@gmail.com>, 2011.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -74,7 +87,7 @@ msgstr "Erreur lors de l'ajout de %s aux favoris."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Pas de catégorie sélectionnée pour la suppression."
+msgstr "Aucune catégorie sélectionnée pour suppression"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -294,7 +307,7 @@ msgstr "Partager via lien"
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Mot de passe"
@@ -397,27 +410,24 @@ msgstr "Réinitialisation de votre mot de passe Owncloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Mail de réinitialisation envoyé."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "La requête a échoué !"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nom d'utilisateur"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Demander la réinitialisation"
@@ -439,7 +449,7 @@ msgstr "Réinitialiser le mot de passe"
#: strings.php:5
msgid "Personal"
-msgstr "Personnel"
+msgstr "Personnels"
#: strings.php:6
msgid "Users"
@@ -467,7 +477,7 @@ msgstr "Introuvable"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Editer les catégories"
+msgstr "Modifier les catégories"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -523,37 +533,37 @@ msgstr "Avancé"
msgid "Data folder"
msgstr "Répertoire des données"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configurer la base de données"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "sera utilisé"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Utilisateur pour la base de données"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Mot de passe de la base de données"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nom de la base de données"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tablespaces de la base de données"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Serveur de la base de données"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Terminer l'installation"
@@ -561,42 +571,37 @@ msgstr "Terminer l'installation"
msgid "web services under your control"
msgstr "services web sous votre contrôle"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Se déconnecter"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Connexion automatique rejetée !"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Mot de passe perdu ?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "se souvenir de moi"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Connexion"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Logins alternatifs"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 94e0d502d9..e694e54615 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,12 +3,29 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013.
+# Cédric MARTIN <sid50.martin@gmail.com>, 2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
+# Cyril Glapa <kyriog@gmail.com>, 2012.
+# David Basquin <dba@alternalease.fr>, 2013.
+# <dba@alternalease.fr>, 2013.
+# froozeify <froozeify@mail.com>, 2013.
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# <gp4004@arghh.org>, 2012.
+# <guiguidu31300@gmail.com>, 2012.
+# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
+# <life_0n_mars@live.fr>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+# Robert Di Rosa <>, 2012-2013.
+# <rom1dep@gmail.com>, 2011.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# <zrk951@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +54,7 @@ msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
+msgstr "Aucune erreur, le fichier a été téléversé avec succès"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +65,19 @@ msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans l
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
+msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Le fichier envoyé n'a été que partiellement envoyé."
+msgstr "Le fichier n'a été que partiellement téléversé"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Pas de fichier envoyé."
+msgstr "Aucun fichier n'a été téléversé"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Absence de dossier temporaire."
+msgstr "Il manque un répertoire temporaire"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +95,21 @@ msgstr "Dossier invalide."
msgid "Files"
msgstr "Fichiers"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Partager"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Supprimer de façon définitive"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Supprimer"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Renommer"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "En attente"
+msgstr "En cours"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -164,7 +177,7 @@ msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible de téléverser votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
+msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
#: js/files.js:272
msgid "Not enough space available"
@@ -297,7 +310,7 @@ msgstr "Ne plus partager"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Téléversement trop volumineux"
+msgstr "Fichier trop volumineux"
#: templates/index.php:110
msgid ""
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index a39633b451..3483ba9782 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 1038a04378..ed1652d85a 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <nicolas@shivaserv.fr>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+# <zrk951@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas
msgid "Error configuring Google Drive storage"
msgstr "Erreur lors de la configuration du support de stockage Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Attention :</b> Le support de Curl n'est pas activé ou installé dans PHP. Le montage de ownCloud / WebDAV ou GoogleDrive n'est pas possible. Contactez votre administrateur système pour l'installer."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Stockage externe"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index d1da943c7c..9959bf5b5c 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <florentin.lemoal@gmail.com>, 2012.
+# <gp4004@arghh.org>, 2012.
+# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+# <windes@tructor.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index eaa5def5c6..f49412eee3 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cédric MARTIN <sid50.martin@gmail.com>, 2013.
+# Romain DEP. <rom1dep@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 9dd1fa7ce3..e997c199e0 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# <zrk951@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 6443c8f3bd..915a78cd2a 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012
+# Robert Di Rosa <>, 2013
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -113,83 +117,83 @@ msgstr "%s vous nez pouvez pas utiliser de points dans le nom de la base de donn
msgid "%s set the database host."
msgstr "%s spécifiez l'hôte de la base de données."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erreur de la base de données : \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "La requête en cause est : \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà ."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Retirer cet utilisateur de la base MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà "
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Retirer cet utilisateur de la base MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "il y a quelques secondes"
+msgstr "Ã l'instant"
#: template.php:114
msgid "1 minute ago"
-msgstr "il y a une minute"
+msgstr "il y a 1 minute"
#: template.php:115
#, php-format
@@ -235,6 +239,19 @@ msgstr "l'année dernière"
msgid "years ago"
msgstr "il y a plusieurs années"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "À jour"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "la vérification des mises à jour est désactivée"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index dbd916ae19..564e045b53 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,14 +3,32 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013.
+# Brice <bmaron@gmail.com>, 2012.
+# Cédric MARTIN <sid50.martin@gmail.com>, 2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2013.
+# Cyril Glapa <kyriog@gmail.com>, 2012.
+# <dba@alternalease.fr>, 2013.
+# <fboulogne@april.org>, 2011.
+# <florentin.lemoal@gmail.com>, 2012.
+# <gp4004@arghh.org>, 2012.
+# <guiguidu31300@gmail.com>, 2012.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# <life_0n_mars@live.fr>, 2012.
+# <mishka.lazzlo@gmail.com>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012-2013.
+# <pierreamiel.giraud@gmail.com>, 2012.
+# Robert Di Rosa <>, 2012.
+# <rom1dep@gmail.com>, 2011, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# <thomash76@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +40,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Impossible de charger la liste depuis l'App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Erreur d'authentification"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Votre nom d'affichage a bien été modifié."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Impossible de modifier le nom d'affichage"
@@ -121,9 +135,9 @@ msgstr "Erreur lors de la mise à jour de l'application"
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Enregistrement..."
+msgstr "Sauvegarde..."
#: js/users.js:43
msgid "deleted"
@@ -137,16 +151,16 @@ msgstr "annuler"
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Supprimer"
@@ -166,7 +180,7 @@ msgstr "Erreur lors de la création de l'utilisateur"
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Français"
@@ -317,19 +331,19 @@ msgstr "Log"
msgid "Log level"
msgstr "Niveau de log"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Plus"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +414,7 @@ msgstr "Obtenez les applications de synchronisation de vos fichiers"
msgid "Show First Run Wizard again"
msgstr "Revoir le premier lancement de l'installeur"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Mot de passe"
@@ -424,70 +438,82 @@ msgstr "Nouveau mot de passe"
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nom affiché"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Adresse mail"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Votre nom d'affichage a bien été modifié"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Impossible de modifier votre nom d'affichage"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Changer le nom affiché"
#: templates/personal.php:70
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Votre adresse e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Langue"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nom de la connexion"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Créer"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Support de stockage par défaut"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Illimité"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Autre"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Support de stockage"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "Changer le nom affiché"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "Changer le mot de passe"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 26cf3a1a6d..dafca62301 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyril Glapa <kyriog@gmail.com>, 2012.
+# <mathieu.payrol@gmail.com>, 2012.
+# <mishka.lazzlo@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# <thomash76@gmail.com>, 2013.
+# <windes@tructor.net>, 2012.
+# <zrk951@gmail.com>, 2013.
+# <zrk951@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 653026359c..2424c7626c 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
+# antiparvos <marcoslansgarza@gmail.com>, 2012.
+# <mbouzada@gmail.com>, 2013.
+# <mbouzada@gmail.com>, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -74,7 +77,7 @@ msgstr "Produciuse un erro ao engadir %s aos favoritos."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Non se seleccionaron categorÃas para eliminación."
+msgstr "Non hai categorÃas seleccionadas para eliminar."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -159,7 +162,7 @@ msgstr "decembro"
#: js/js.js:286
msgid "Settings"
-msgstr "Axustes"
+msgstr "Configuracións"
#: js/js.js:718
msgid "seconds ago"
@@ -175,7 +178,7 @@ msgstr "hai {minutes} minutos"
#: js/js.js:721
msgid "1 hour ago"
-msgstr "Vai 1 hora"
+msgstr "hai 1 hora"
#: js/js.js:722
msgid "{hours} hours ago"
@@ -294,7 +297,7 @@ msgstr "Compartir coa ligazón"
msgid "Password protect"
msgstr "Protexido con contrasinais"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Contrasinal"
@@ -397,27 +400,24 @@ msgstr "Restabelecer o contrasinal de ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Usa a seguinte ligazón para restabelecer o contrasinal: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aà pregúntelle ao seu administrador local.."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Non foi posÃbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto."
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Restabelecer o envÃo por correo."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Non foi posÃbel facer a petición"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nome de usuario"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Petición de restabelecemento"
@@ -451,7 +451,7 @@ msgstr "Aplicativos"
#: strings.php:8
msgid "Admin"
-msgstr "Administración"
+msgstr "Admin"
#: strings.php:9
msgid "Help"
@@ -467,7 +467,7 @@ msgstr "Nube non atopada"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Editar as categorÃas"
+msgstr "Editar categorÃas"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -523,37 +523,37 @@ msgstr "Avanzado"
msgid "Data folder"
msgstr "Cartafol de datos"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configurar a base de datos"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "vai ser utilizado"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Usuario da base de datos"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Contrasinal da base de datos"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nome da base de datos"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Táboa de espazos da base de datos"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Servidor da base de datos"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Rematar a configuración"
@@ -561,42 +561,37 @@ msgstr "Rematar a configuración"
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Desconectar"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Rexeitouse a entrada automática"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se non fixo recentemente cambios de contrasinal é posÃbel que a súa conta estea comprometida!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Perdeu o contrasinal?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Conectar"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Accesos alternativos"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index df7ddc55d2..b257aba173 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# antiparvos <marcoslansgarza@gmail.com>, 2012-2013.
+# <mbouzada@gmail.com>, 2013.
+# <mbouzada@gmail.com>, 2013.
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -33,11 +38,11 @@ msgstr "Non é posÃbel renomear o ficheiro"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr "Non se enviou ningún ficheiro. Produciuse un erro descoñecido."
+msgstr "Non foi enviado ningún ficheiro. Produciuse un erro descoñecido."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Non houbo erros, o ficheiro enviouse correctamente"
+msgstr "Non se produciu ningún erro. O ficheiro enviouse correctamente"
#: ajax/upload.php:27
msgid ""
@@ -48,11 +53,11 @@ msgstr "O ficheiro enviado excede a directiva indicada por upload_max_filesize d
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML"
+msgstr "O ficheiro enviado excede a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "O ficheiro so foi parcialmente enviado"
+msgstr "O ficheiro enviado foi só parcialmente enviado"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -60,7 +65,7 @@ msgstr "Non se enviou ningún ficheiro"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Falta o cartafol temporal"
+msgstr "Falta un cartafol temporal"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +83,15 @@ msgstr "O directorio é incorrecto."
msgid "Files"
msgstr "Ficheiros"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Compartir"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Eliminar"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Renomear"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index deed371c80..d25b1b2d5a 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mbouzada@gmail.com>, 2013.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index d0b6177856..f000f90728 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mbouzada@gmail.com>, 2013.
+# <mbouzada@gmail.com>, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Forneza unha chave correcta e segreda do Dropbox."
msgid "Error configuring Google Drive storage"
msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> «smbclient» non está instalado. Non é posibel a montaxe de comparticións CIFS/SMB. Consulte co administrador do sistema para instalalo."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Aviso:</b> A compatibilidade de FTP en PHP non está activada ou instalada. Non é posibel a montaxe de comparticións FTP. Consulte co administrador do sistema para instalalo."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Aviso:</ b> A compatibilidade de Curl en PHP non está activada ou instalada. Non é posÃbel a montaxe de ownCloud / WebDAV ou GoogleDrive. Consulte co administrador do sistema para instalala."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Almacenamento externo"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index e9c4c07adc..657f1da63e 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mbouzada@gmail.com>, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 5f9f69c526..64cdc9dbdc 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mbouzada@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index b7440fc633..0744649b03 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mbouzada@gmail.com>, 2013.
+# <mbouzada@gmail.com>, 2012.
+# Miguel Branco <mgl.branco@gmail.com>, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index f537590573..7795b9dddb 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2012
+# Miguel Branco <mgl.branco@gmail.com>, 2012
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +31,7 @@ msgstr "Persoal"
#: app.php:373
msgid "Settings"
-msgstr "Axustes"
+msgstr "Configuracións"
#: app.php:385
msgid "Users"
@@ -67,7 +71,7 @@ msgstr "O aplicativo non está activado"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Produciuse un erro de autenticación"
+msgstr "Produciuse un erro na autenticación"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,72 +117,72 @@ msgstr "%s non se poden empregar puntos na base de datos"
msgid "%s set the database host."
msgstr "%s estabeleza o servidor da base de datos"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Deberá introducir unha conta existente ou o administrador."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Produciuse un erro na base de datos: «%s»"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "A orde ofensiva foi: «%s»"
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O usuario MySQL '%s'@'localhost' xa existe."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Omitir este usuario de MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "O usuario MySQL «%s»@«%%» xa existe."
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Omitir este usuario de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s"
-#: setup.php:858
+#: setup.php:853
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:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Volva comprobar as <a href='%s'>guÃas de instalación</a>"
@@ -235,6 +239,19 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s está dispoñÃbel. Obtéña <a href=\"%s\">máis información</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "actualizado"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "a comprobación de actualizacións está desactivada"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 7b3e9df3f1..2230f6a0de 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -3,14 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mbouzada <mbouzada@gmail.com>, 2013
+# antiparvos <marcoslansgarza@gmail.com>, 2012.
+# <mbouzada@gmail.com>, 2012-2013.
+# <mbouzada@gmail.com>, 2013.
+# <mbouzada@gmail.com>, 2012.
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 09:00+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +27,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Non foi posÃbel cargar a lista desde a App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Produciuse un erro de autenticación"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "O seu nome visÃbel foi cambiado"
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Non é posÃbel cambiar o nome visÃbel"
@@ -121,7 +122,7 @@ msgstr "Produciuse un erro mentres actualizaba o aplicativo"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Gardando..."
@@ -137,16 +138,16 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Non é posÃbel retirar o usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupo Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Eliminar"
@@ -166,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:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Galego"
@@ -317,19 +318,19 @@ msgstr "Rexistro"
msgid "Log level"
msgstr "Nivel de rexistro"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Máis"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
msgid "Show First Run Wizard again"
msgstr "Amosar o axudante da primeira execución outra vez"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Contrasinal"
@@ -424,70 +425,82 @@ msgstr "Novo contrasinal"
msgid "Change password"
msgstr "Cambiar o contrasinal"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Amosar o nome"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "O seu nome visÃbel foi cambiado"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Non é posÃbel cambiar o seu nome visÃbel"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Cambiar o nome visÃbel"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Correo"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "O seu enderezo de correo"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nome de acceso"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Almacenamento predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Sen lÃmites"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Almacenamento"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "cambiar o nome visÃbel"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "estabelecer un novo contrasinal"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 37a1e107ae..44b41641e2 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mbouzada@gmail.com>, 2012-2013.
+# <mbouzada@gmail.com>, 2013.
+# <mbouzada@gmail.com>, 2012.
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
+# Miguel Branco, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -39,7 +44,7 @@ msgstr "A configuración non é correcta. Vexa o rexistro de ownCloud para máis
#: js/settings.js:66
msgid "Deletion failed"
-msgstr "Produciuse un fallo ao eliminar"
+msgstr "Fallou o borrado"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 88f6865e1b..742b5ad873 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dovix Dovix <dovix2003@gmail.com>, 2012.
+# Gilad Naaman <gilad.doom@gmail.com>, 2013.
+# <ido.parag@gmail.com>, 2012.
+# <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -293,9 +298,9 @@ msgstr "שיתוף ×¢× ×§×™×©×•×¨"
msgid "Password protect"
msgstr "×”×’× ×” בססמה"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
-msgstr "סיסמ×"
+msgstr "ססמה"
#: js/share.js:173
msgid "Email link to person"
@@ -396,27 +401,24 @@ msgstr "×יפוס הססמה של ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "יש להשתמש בקישור ×”×‘× ×›×“×™ ל×פס ×ת הססמה שלך: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "יישלח לתיבת הדו×״ל שלך קישור ל×יפוס הססמה."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "×©× ×ž×©×ª×ž×©"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "בקשת ×יפוס"
@@ -466,7 +468,7 @@ msgstr "×¢× ×Ÿ ×œ× × ×ž×¦×"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "ערוך קטגוריות"
+msgstr "עריכת הקטגוריות"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -522,80 +524,75 @@ msgstr "מתקד×"
msgid "Data folder"
msgstr "תיקיית × ×ª×•× ×™×"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "הגדרת מסד ×”× ×ª×•× ×™×"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "×™× ×•×¦×œ×•"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "×©× ×ž×©×ª×ž×© במסד ×”× ×ª×•× ×™×"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "ססמת מסד ×”× ×ª×•× ×™×"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "×©× ×ž×¡×“ ×”× ×ª×•× ×™×"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "מרחב הכתובות של מסד ×”× ×ª×•× ×™×"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "שרת בסיס × ×ª×•× ×™×"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "×¡×™×•× ×”×ª×§× ×”"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "שירותי רשת תחת השליטה שלך"
+msgstr "שירותי רשת בשליטתך"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "×”×ª× ×ª×§×•×ª"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "בקשת ×”×›× ×™×¡×” ×”×וטומטית × ×“×—×ª×”!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "×× ×œ× ×©×™× ×™×ª ×ת ססמתך ל××—×¨×•× ×”, יתכן ×©×—×©×‘×•× ×š × ×¤×’×¢!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "× × ×œ×©× ×•×ª ×ת הססמה שלך כדי ל×בטח ×ת ×—×©×‘×•× ×š מחדש."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "שכחת ×ת ססמתך?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "שמירת הססמה"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "×›× ×™×¡×”"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "×›× ×™×¡×•×ª ××œ×˜×¨× ×˜×™×‘×™×•×ª"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 9466616bd3..6880b3e051 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dovix Dovix <dovix2003@gmail.com>, 2012.
+# <ido.parag@gmail.com>, 2012.
+# <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +41,7 @@ msgstr "×œ× ×”×•×¢×œ×” קובץ. טעות בלתי מזוהה."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "×œ× ×”×ª×¨×—×©×” שגי××”, הקובץ הועלה בהצלחה"
+msgstr "×œ× ×ירעה תקלה, ×”×§×‘×¦×™× ×”×•×¢×œ×• בהצלחה"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +52,19 @@ msgstr "×”×§×‘×¦×™× ×©× ×©×œ×—×• ×—×•×¨×’×™× ×ž×”×’×•×“×œ שצוין בהגד
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML"
+msgstr "הקובץ שהועלה חרג ×ž×”×”× ×—×™×” MAX_FILE_SIZE ×©×¦×•×™× ×” בטופס ×”Ö¾HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "הקובץ הועלה ב×ופן חלקי בלבד"
+msgstr "הקובץ שהועלה הועלה בצורה חלקית"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "×©×•× ×§×•×‘×¥ ×œ× ×”×•×¢×œ×”"
+msgstr "×œ× ×”×•×¢×œ×• קבצי×"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "תקיה ×–×ž× ×™×ª חסרה"
+msgstr "תיקייה ×–×ž× ×™×ª חסרה"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +82,15 @@ msgstr ""
msgid "Files"
msgstr "קבצי×"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "שתף"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "מחק לצמיתות"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "מחיקה"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "×©×™× ×•×™ ש×"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 2d25899318..538cffbef3 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index c0c781c9cd..b8639454e1 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "× × ×œ×¡×¤×§ קוד ×™×™×©×•× ×•×¡×•×“ ×ª×§× ×™×™× ×©×œ Dropbox."
msgid "Error configuring Google Drive storage"
msgstr "×ירעה שגי××” בעת הגדרת ×חסון ב־Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "×חסון ×—×™×¦×•× ×™"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index a457a7f614..a559adcb01 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "סיסמ×"
+msgstr "ססמה"
#: templates/authenticate.php:6
msgid "Submit"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index c5e7737bb8..40c11b0596 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index e39843a6d4..d3d2624d33 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +52,7 @@ msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "גרס×ות"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index d611275471..9cc939954e 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +115,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +237,19 @@ msgstr "×©× ×” שעברה"
msgid "years ago"
msgstr "×©× ×™×"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s זמין. קבלת <a href=\"%s\">מידע × ×•×¡×£</a>"
+
+#: 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\""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index ce9cabd5bc..afbda925de 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2012.
+# <ido.parag@gmail.com>, 2012.
+# <tomerc+transifex.net@gmail.com>, 2011.
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +25,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "×œ× × ×™×ª×Ÿ לטעון רשימה מה־App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "שגי×ת הזדהות"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -98,7 +98,7 @@ msgstr "בטל"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "הפעלה"
+msgstr "הפעל"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,9 +120,9 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "שמירה…"
+msgstr "שומר.."
#: js/users.js:43
msgid "deleted"
@@ -136,16 +136,16 @@ msgstr "ביטול"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "קבוצות"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "×ž× ×”×œ הקבוצה"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "מחיקה"
@@ -165,7 +165,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "עברית"
@@ -310,25 +310,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "יומן"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "יותר"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "פחות"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "גרס×"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +399,9 @@ msgstr "השג ×ת ×”×פליקציות על ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ×ת הקבצ
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
-msgstr "סיסמ×"
+msgstr "ססמה"
#: templates/personal.php:38
msgid "Your password was changed"
@@ -423,70 +423,82 @@ msgstr "ססמה חדשה"
msgid "Change password"
msgstr "×©×™× ×•×™ ססמה"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "דו×ר ××œ×§×˜×¨×•× ×™"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "דו×״ל"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "כתובת הדו×״ל שלך"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "× × ×œ×ž×œ× ×ת כתובת הדו×״ל שלך כדי ל×פשר שחזור ססמה"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "פה"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "עזרה בתרגו×"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "השתמש בכתובת ×–×ת על ×ž× ×ª להתחבר ×ל ownCloud דרך סייר קבצי×."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "יצירה"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "×חר"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 92e6ef6be1..c2c294c997 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 09e45c10d5..b352ad1288 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Omkar Tapale <omkar_tapale@live.com>, 2012.
+# Sanjay Rabidas <rabidassanjay@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +295,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "पासवरà¥à¤¡"
@@ -396,27 +398,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "आगे दिये गये लिंक का उपयोग पासवरà¥à¤¡ बदलने के लिये किजीये: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "पासवरà¥à¤¡ बदलने कि लिंक आपको ई-मेल दà¥à¤µà¤¾à¤°à¤¾ à¤à¥‡à¤œà¥€ जायेगी|"
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "पासवरà¥à¤¡ बदलने कि लिंक आपको ई-मेल दà¥à¤µà¤¾à¤°à¤¾ à¤à¥‡à¤œà¥€ जायेगी|"
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "पà¥à¤°à¤¯à¥‹à¤•à¥à¤¤à¤¾ का नाम"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +521,37 @@ msgstr "उनà¥à¤¨à¤¤"
msgid "Data folder"
msgstr "डाटा फोलà¥à¤¡à¤°"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "डेटाबेस कॉनà¥à¤«à¤¼à¤¿à¤—र करें "
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "उपयोग होगा"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "डेटाबेस उपयोगकरà¥à¤¤à¤¾"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "डेटाबेस पासवरà¥à¤¡"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "डेटाबेस का नाम"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "सेटअप समापà¥à¤¤ करे"
@@ -560,42 +559,37 @@ msgstr "सेटअप समापà¥à¤¤ करे"
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "लोग आउट"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "याद रखें"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index e2c6db13a0..058c4dc6c9 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 1c0263d2b3..429b94708d 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index befaf1f2c9..0bae5719b4 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index d56df17b30..1691691d5d 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "पासवरà¥à¤¡"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index ad93e8681d..dccfd5206e 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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 66568383a7..48dc088aa1 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index bee0b2803d..d7d72d96af 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index b8210ac04b..ce178a2bac 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "पासवरà¥à¤¡"
@@ -423,70 +419,82 @@ msgstr "नया पासवरà¥à¤¡"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 68d753a4e2..7ed6220d5f 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "पासवरà¥à¤¡"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 5ad69e813e..6aa351f1a2 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
+# <franz@franz-net.info>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +77,7 @@ msgstr ""
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Niti jedna kategorija nije odabrana za brisanje."
+msgstr "Nema odabranih kategorija za brisanje."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -243,7 +247,7 @@ msgstr ""
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr "Greška"
+msgstr "Pogreška"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
@@ -293,7 +297,7 @@ msgstr "Djeli preko link-a"
msgid "Password protect"
msgstr "Zaštiti lozinkom"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Lozinka"
@@ -396,27 +400,24 @@ msgstr "ownCloud resetiranje lozinke"
msgid "Use the following link to reset your password: {link}"
msgstr "Koristite ovaj link da biste poništili lozinku: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "KorisniÄko ime"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Zahtjev za resetiranjem"
@@ -516,43 +517,43 @@ msgstr "Stvori <strong>administratorski raÄun</strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr "Napredno"
+msgstr "Dodatno"
#: templates/installation.php:64
msgid "Data folder"
msgstr "Mapa baze podataka"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfiguriraj bazu podataka"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "će se koristiti"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Korisnik baze podataka"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Lozinka baze podataka"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Ime baze podataka"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Poslužitelj baze podataka"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Završi postavljanje"
@@ -560,42 +561,37 @@ msgstr "Završi postavljanje"
msgid "web services under your control"
msgstr "web usluge pod vašom kontrolom"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Odjava"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "zapamtiti"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Prijava"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index bf86e8720a..d1184dcf60 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+# <franz@franz-net.info>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +40,7 @@ msgstr ""
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Nema pogreške, datoteka je poslana uspješno."
+msgstr "Datoteka je poslana uspješno i bez pogrešaka"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +51,19 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Poslana datoteka prelazi veliÄinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
+msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Poslana datoteka je parcijalno poslana"
+msgstr "Datoteka je poslana samo djelomiÄno"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Datoteka nije poslana"
+msgstr "Ni jedna datoteka nije poslana"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Nedostaje privremeni direktorij"
+msgstr "Nedostaje privremena mapa"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +81,15 @@ msgstr ""
msgid "Files"
msgstr "Datoteke"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Podijeli"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "Obriši"
+msgstr "Briši"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Promjeni ime"
@@ -132,7 +131,7 @@ msgstr "1 datoteka se uÄitava"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "datoteke se uÄitavaju"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -193,7 +192,7 @@ msgstr "Greška"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -221,7 +220,7 @@ msgstr ""
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "UÄitaj"
+msgstr "Pošalji"
#: templates/admin.php:5
msgid "File handling"
@@ -289,11 +288,11 @@ msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!"
#: templates/index.php:76
msgid "Download"
-msgstr "Preuzimanje"
+msgstr "Preuzmi"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Makni djeljenje"
+msgstr "Prekini djeljenje"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index ba59607422..a4e8af9c56 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 2e386aed7b..af0395bead 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 7e51b0c2de..f3d4834e76 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Lozinka"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Pošalji"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Preuzimanje"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "web usluge pod vašom kontrolom"
+msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 991690ed18..152f07f368 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 6004430d18..12e83d69fb 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 4004b99b0e..fa043de4d8 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "Korisnici"
#: app.php:398
msgid "Apps"
-msgstr "Aplikacije"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr "prošlu godinu"
msgid "years ago"
msgstr "godina"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 6bc1187371..e6e8a04521 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+# <franz@franz-net.info>, 2012.
+# Thomas Silađi <thomas.siladi@net.hr>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nemogićnost uÄitavanja liste sa Apps Stora"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Greška kod autorizacije"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +119,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Spremanje..."
@@ -136,16 +135,16 @@ msgstr "vrati"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupa Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Obriši"
@@ -165,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__ime_jezika__"
@@ -235,7 +234,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -310,25 +309,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "dnevnik"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr "više"
+msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Lozinka"
@@ -423,70 +422,82 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "e-mail adresa"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Vaša e-mail adresa"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Izradi"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "ostali"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 7cec467c48..5f2540a610 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "Lozinka"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 75eab46f63..be7a469931 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Adam Toth <adazlord@gmail.com>, 2012.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
+# <mail@tamas-nagy.net>, 2011.
+# Peter Borsa <peter.borsa@gmail.com>, 2012.
+# Tamas Nagy <mail@tamas-nagy.net>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -218,7 +223,7 @@ msgstr "Ok"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Mégsem"
+msgstr "Mégse"
#: js/oc-dialogs.js:185
msgid "Choose"
@@ -293,7 +298,7 @@ msgstr "Link megadásával osztom meg"
msgid "Password protect"
msgstr "Jelszóval is védem"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Jelszó"
@@ -396,27 +401,24 @@ msgstr "ownCloud jelszó-visszaállÃtás"
msgid "Use the following link to reset your password: {link}"
msgstr "Használja ezt a linket a jelszó ismételt beállÃtásához: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Egy emailben fog értesÃtést kapni a jelszóbeállÃtás módjáról."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Elküldtük az emailt a jelszó ismételt beállÃtásához."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Nem sikerült a kérést teljesÃteni!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Felhasználónév"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "VisszaállÃtás igénylése"
@@ -430,7 +432,7 @@ msgstr "A bejelentkező ablakhoz"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "Az új jelszó"
+msgstr "Új jelszó"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -450,7 +452,7 @@ msgstr "Alkalmazások"
#: strings.php:8
msgid "Admin"
-msgstr "Adminsztráció"
+msgstr "Adminisztráció"
#: strings.php:9
msgid "Help"
@@ -522,37 +524,37 @@ msgstr "Haladó"
msgid "Data folder"
msgstr "Adatkönyvtár"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Adatbázis konfigurálása"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "adatbázist fogunk használni"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Adatbázis felhasználónév"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Adatbázis jelszó"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Az adatbázis neve"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Az adatbázis táblázattér (tablespace)"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Adatbázis szerver"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "A beállÃtások befejezése"
@@ -560,42 +562,37 @@ msgstr "A beállÃtások befejezése"
msgid "web services under your control"
msgstr "webszolgáltatások saját kézben"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Kilépés"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Az automatikus bejelentkezés sikertelen!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Ha mostanában nem módosÃtotta a jelszavát, akkor lehetséges, hogy idegenek jutottak be a rendszerbe az Ön nevében!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Elfelejtette a jelszavát?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "emlékezzen"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Bejelentkezés"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "AlternatÃv bejelentkezés"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 6b5c091cb9..c9c6e0609e 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Adam Toth <adazlord@gmail.com>, 2012.
+# Akos <nagy.akos@libreoffice.ro>, 2013.
+# <gyonkibendeguz@gmail.com>, 2013.
+# <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
+# <mail@tamas-nagy.net>, 2011.
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -56,7 +63,7 @@ msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nem töltődött fel állomány"
+msgstr "Nem töltődött fel semmi"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +85,15 @@ msgstr "Érvénytelen mappa."
msgid "Files"
msgstr "Fájlok"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Megosztás"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Törlés"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Ãtnevezés"
@@ -293,7 +296,7 @@ msgstr "Letöltés"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "A megosztás visszavonása"
+msgstr "Megosztás visszavonása"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 319463b638..4bf863c88d 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Akos <nagy.akos@libreoffice.ro>, 2013.
+# Csaba Orban <vicsabi@gmail.com>, 2012.
+# <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 898896a6bc..0f4348a55c 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!"
msgid "Error configuring Google Drive storage"
msgstr "A Google Drive tárolót nem sikerült beállÃtani"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Figyelem:</b> az \"smbclient\" nincs telepÃtve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepÃtse a szükséges programot."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Figyelem:</b> a PHP FTP támogatása vagy nincs telepÃtve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepÃtse a szükséges programot."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Külső tárolási szolgáltatások becsatolása"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index c2a6ad60a7..7897dc58ce 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Csaba Orban <vicsabi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index a9a5961b17..dafccd8911 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Akos <nagy.akos@libreoffice.ro>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index c10a67b3b8..ef316affe7 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 9b4f3529f8..811a4db402 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Adam Toth <adazlord@gmail.com>, 2012
+# gyeben <gyonkibendeguz@gmail.com>, 2013
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +70,7 @@ msgstr "Az alkalmazás nincs engedélyezve"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "AzonosÃtási hiba"
+msgstr "HitelesÃtési hiba"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,79 +116,79 @@ msgstr "%s az adatbázis neve nem tartalmazhat pontot"
msgid "%s set the database host."
msgstr "%s adja meg az adatbázist szolgáltató számÃtógép nevét."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Adatbázis hiba: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "A hibát ez a parancs okozta: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Törölje ezt a felhasználót a MySQL-ből"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Törölje ezt a felhasználót a MySQL-ből."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Az Ön webkiszolgálója nincs megfelelÅ‘en beállÃtva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepÃtési útmutatót</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "pár másodperce"
+msgstr "másodperce"
#: template.php:114
msgid "1 minute ago"
@@ -233,7 +236,20 @@ msgstr "tavaly"
#: template.php:124
msgid "years ago"
-msgstr "több éve"
+msgstr "éve"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s elérhető. <a href=\"%s\">További információ</a>."
+
+#: updater.php:81
+msgid "up to date"
+msgstr "a legfrissebb változat"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "A frissitések ellenőrzése nincs engedélyezve."
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 7d8b769bd5..b1e991aa40 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Adam Toth <adazlord@gmail.com>, 2012.
+# <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
+# Peter Borsa <peter.borsa@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +25,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nem tölthető le a lista az App Store-ból"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "AzonosÃtási hiba"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Nem sikerült megváltoztatni a megjelenÃtési nevet"
@@ -98,7 +98,7 @@ msgstr "Letiltás"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "engedélyezve"
+msgstr "Engedélyezés"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +120,7 @@ msgstr "Hiba történt a programfrissÃtés közben"
msgid "Updated"
msgstr "FrissÃtve"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Mentés..."
@@ -136,16 +136,16 @@ msgstr "visszavonás"
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolÃtáni"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Törlés"
@@ -165,7 +165,7 @@ msgstr "A felhasználó nem hozható létre"
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -316,19 +316,19 @@ msgstr "Naplózás"
msgid "Log level"
msgstr "Naplózási szint"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Több"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Kevesebb"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Verzió"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Töltse le az állományok szinkronizációjához szükséges programoka
msgid "Show First Run Wizard again"
msgstr "Nézzük meg újra az elsÅ‘ bejelentkezéskori segÃtséget!"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Jelszó"
@@ -423,70 +423,82 @@ msgstr "Az új jelszó"
msgid "Change password"
msgstr "A jelszó megváltoztatása"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "A megjelenÃtett név"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Az Ön megjelenÃtési neve megváltozott"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Nem sikerült megváltoztatni az Ön megjelenÃtési nevét"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "A megjelenÃtési név módosÃtása"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Az Ön email cÃme"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Adja meg az email cÃmét, hogy jelszó-emlékeztetÅ‘t kérhessen, ha elfelejtette a jelszavát!"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Nyelv"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "SegÃtsen a fordÃtásban!"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ennek a cÃmnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelÅ‘jével is is elérheti az állományait."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Bejelentkezési név"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Létrehozás"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Alapértelmezett tárhely"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Korlátlan"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Más"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Tárhely"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "a megjelenÃtett név módosÃtása"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "új jelszó beállÃtása"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 55f3c26873..804a0fd48f 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f393e4f5a2..868a6e0e91 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,388 +7,211 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:97
-#, php-format
-msgid "User %s shared a file with you"
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
msgstr ""
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, 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
+#: ajax/vcategories/add.php:29
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."
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
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:34
-msgid "Sunday"
-msgstr "Ô¿Õ«Ö€Õ¡Õ¯Õ«"
-
-#: js/config.php:35
-msgid "Monday"
-msgstr "ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«"
-
-#: js/config.php:36
-msgid "Tuesday"
-msgstr "ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«"
-
-#: js/config.php:37
-msgid "Wednesday"
-msgstr "Õ‰Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«"
-
-#: js/config.php:38
-msgid "Thursday"
-msgstr "Õ€Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«"
-
-#: js/config.php:39
-msgid "Friday"
-msgstr "ÕˆÖ‚Ö€Õ¢Õ¡Õ©"
-
-#: js/config.php:40
-msgid "Saturday"
-msgstr "Õ‡Õ¡Õ¢Õ¡Õ©"
-
-#: js/config.php:45
-msgid "January"
-msgstr "Õ€Õ¸Ö‚Õ¶Õ¾Õ¡Ö€"
-
-#: js/config.php:46
-msgid "February"
-msgstr "Õ“Õ¥Õ¿Ö€Õ¾Õ¡Ö€"
-
-#: js/config.php:47
-msgid "March"
-msgstr "Õ„Õ¡Ö€Õ¿"
-
-#: js/config.php:48
-msgid "April"
-msgstr "Ô±ÕºÖ€Õ«Õ¬"
-
-#: js/config.php:49
-msgid "May"
-msgstr "Õ„Õ¡ÕµÕ«Õ½"
-
-#: js/config.php:50
-msgid "June"
-msgstr "Õ€Õ¸Ö‚Õ¶Õ«Õ½"
-
-#: js/config.php:51
-msgid "July"
-msgstr "Õ€Õ¸Ö‚Õ¬Õ«Õ½"
-
-#: js/config.php:52
-msgid "August"
-msgstr "Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½"
-
-#: js/config.php:53
-msgid "September"
-msgstr "ÕÕ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€"
-
-#: js/config.php:54
-msgid "October"
-msgstr "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
-
-#: js/config.php:55
-msgid "November"
-msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
-
-#: js/config.php:56
-msgid "December"
-msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
-
-#: js/js.js:286
+#: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
msgid "Settings"
msgstr ""
-#: js/js.js:718
-msgid "seconds ago"
-msgstr ""
-
-#: js/js.js:719
-msgid "1 minute ago"
+#: js/js.js:670
+msgid "January"
msgstr ""
-#: js/js.js:720
-msgid "{minutes} minutes ago"
+#: js/js.js:670
+msgid "February"
msgstr ""
-#: js/js.js:721
-msgid "1 hour ago"
+#: js/js.js:670
+msgid "March"
msgstr ""
-#: js/js.js:722
-msgid "{hours} hours ago"
+#: js/js.js:670
+msgid "April"
msgstr ""
-#: js/js.js:723
-msgid "today"
+#: js/js.js:670
+msgid "May"
msgstr ""
-#: js/js.js:724
-msgid "yesterday"
+#: js/js.js:670
+msgid "June"
msgstr ""
-#: js/js.js:725
-msgid "{days} days ago"
+#: js/js.js:671
+msgid "July"
msgstr ""
-#: js/js.js:726
-msgid "last month"
+#: js/js.js:671
+msgid "August"
msgstr ""
-#: js/js.js:727
-msgid "{months} months ago"
+#: js/js.js:671
+msgid "September"
msgstr ""
-#: js/js.js:728
-msgid "months ago"
+#: js/js.js:671
+msgid "October"
msgstr ""
-#: js/js.js:729
-msgid "last year"
+#: js/js.js:671
+msgid "November"
msgstr ""
-#: js/js.js:730
-msgid "years ago"
+#: js/js.js:671
+msgid "December"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:123
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:159
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
-msgid "No"
+#: js/oc-dialogs.js:177
+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."
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:497
+#: js/share.js:509
msgid "Error"
msgstr ""
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr ""
-
-#: js/share.js:30 js/share.js:45 js/share.js:87
-msgid "Shared"
-msgstr ""
-
-#: js/share.js:90
-msgid "Share"
-msgstr ""
-
-#: js/share.js:125 js/share.js:617
+#: js/share.js:103
msgid "Error while sharing"
msgstr ""
-#: js/share.js:136
+#: js/share.js:114
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:143
+#: js/share.js:121
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:152
+#: js/share.js:130
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:154
+#: js/share.js:132
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:159
+#: js/share.js:137
msgid "Share with"
msgstr ""
-#: js/share.js:164
+#: js/share.js:142
msgid "Share with link"
msgstr ""
-#: js/share.js:167
+#: js/share.js:143
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
msgid "Password"
msgstr ""
-#: js/share.js:173
-msgid "Email link to person"
-msgstr ""
-
-#: js/share.js:174
-msgid "Send"
-msgstr ""
-
-#: js/share.js:178
+#: js/share.js:152
msgid "Set expiration date"
msgstr ""
-#: js/share.js:179
+#: js/share.js:153
msgid "Expiration date"
msgstr ""
-#: js/share.js:211
+#: js/share.js:185
msgid "Share via email:"
msgstr ""
-#: js/share.js:213
+#: js/share.js:187
msgid "No people found"
msgstr ""
-#: js/share.js:251
+#: js/share.js:214
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:287
+#: js/share.js:250
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:308
+#: js/share.js:271
msgid "Unshare"
msgstr ""
-#: js/share.js:320
+#: js/share.js:283
msgid "can edit"
msgstr ""
-#: js/share.js:322
+#: js/share.js:285
msgid "access control"
msgstr ""
-#: js/share.js:325
+#: js/share.js:288
msgid "create"
msgstr ""
-#: js/share.js:328
+#: js/share.js:291
msgid "update"
msgstr ""
-#: js/share.js:331
+#: js/share.js:294
msgid "delete"
msgstr ""
-#: js/share.js:334
+#: js/share.js:297
msgid "share"
msgstr ""
-#: js/share.js:368 js/share.js:564
+#: js/share.js:322 js/share.js:484
msgid "Password protected"
msgstr ""
-#: js/share.js:577
+#: js/share.js:497
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:589
+#: js/share.js:509
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:604
-msgid "Sending ..."
-msgstr ""
-
-#: js/share.js:615
-msgid "Email sent"
-msgstr ""
-
-#: js/update.js:14
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr ""
-
-#: js/update.js:18
-msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
-
-#: lostpassword/controller.php:48
+#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -396,27 +219,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -468,135 +288,116 @@ msgstr ""
msgid "Edit categories"
msgstr ""
-#: templates/edit_categories_dialog.php:16
+#: templates/edit_categories_dialog.php:14
msgid "Add"
msgstr ""
-#: templates/installation.php:24 templates/installation.php:31
-#: templates/installation.php:38
+#: templates/installation.php:23 templates/installation.php:31
msgid "Security Warning"
msgstr ""
-#: templates/installation.php:25
-msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
-
-#: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
-
-#: templates/installation.php:32
+#: templates/installation.php:24
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:33
+#: templates/installation.php:26
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
-#: templates/installation.php:39
-msgid ""
-"Your data directory and files are probably accessible from the internet "
-"because the .htaccess file does not work."
-msgstr ""
-
-#: templates/installation.php:40
+#: templates/installation.php:32
msgid ""
-"For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
msgstr ""
-#: templates/installation.php:44
+#: templates/installation.php:36
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:62
+#: templates/installation.php:48
msgid "Advanced"
msgstr ""
-#: templates/installation.php:64
+#: templates/installation.php:50
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:57
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:105
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:109
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:113
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:121
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:127
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:132
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:40
+#: templates/layout.guest.php:38
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:34
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:8
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:9
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:10
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:15
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:27
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:28
msgid "Log in"
msgstr ""
-#: templates/login.php:47
-msgid "Alternative Logins"
+#: templates/logout.php:1
+msgid "You are logged out."
msgstr ""
#: templates/part.pagenavi.php:3
@@ -607,7 +408,16 @@ msgstr ""
msgid "next"
msgstr ""
-#: templates/update.php:3
-#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr ""
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index f372a97b7a..2bb63c0f9e 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index a6e391b464..2b6464945d 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 22d56339ab..8d83b7805c 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,26 +23,26 @@ msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬"
+msgstr ""
-#: templates/public.php:10
+#: templates/public.php:9
#, php-format
msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:13
+#: templates/public.php:11
#, php-format
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
-msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
+msgstr ""
-#: templates/public.php:40
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:50
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index 57d556aab1..fe5d782b2a 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 0ce7e26c45..55dedea9be 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.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-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Ô±ÕµÕ¬"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 8968d1e066..234d6e2961 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Contrasigno"
@@ -396,27 +397,24 @@ msgstr "Reinitialisation del contrasigno de ownCLoud"
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nomine de usator"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Requestar reinitialisation"
@@ -522,37 +520,37 @@ msgstr "Avantiate"
msgid "Data folder"
msgstr "Dossier de datos"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configurar le base de datos"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "essera usate"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Usator de base de datos"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Contrasigno de base de datos"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nomine de base de datos"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Hospite de base de datos"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +558,37 @@ msgstr ""
msgid "web services under your control"
msgstr "servicios web sub tu controlo"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Clauder le session"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Tu perdeva le contrasigno?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "memora"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Aperir session"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 3077818503..db3b51415e 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -56,7 +58,7 @@ msgstr "Le file incargate solmente esseva incargate partialmente"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nulle file esseva incargate."
+msgstr "Nulle file esseva incargate"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +80,15 @@ msgstr ""
msgid "Files"
msgstr "Files"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Compartir"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Deler"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 542eba1d2e..075ccfc669 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index bebf028aa8..51c38dce12 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 0234ab82aa..2648b60d7a 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Contrasigno"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Submitter"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Discargar"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "servicios web sub tu controlo"
+msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index b4969f152e..711ce68f35 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 7c02d48b46..236cc1eb79 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 304647c370..ac00206559 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "Usatores"
#: app.php:398
msgid "Apps"
-msgstr "Applicationes"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 401027e562..0c7beb23e9 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
+# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +23,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +118,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +134,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Gruppos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Deler"
@@ -165,7 +163,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Interlingua"
@@ -310,25 +308,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Registro"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr "Plus"
+msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +397,7 @@ msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Contrasigno"
@@ -423,70 +421,82 @@ msgstr "Nove contrasigno"
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-posta"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Tu adresse de e-posta"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Linguage"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Altere"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index f0a118496f..5098a66b47 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "Contrasigno"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 99b5e5b934..0a94ad4da8 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <evanlimanto@gmail.com>, 2013.
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
+# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -218,7 +225,7 @@ msgstr "Oke"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Batal"
+msgstr "Batalkan"
#: js/oc-dialogs.js:185
msgid "Choose"
@@ -293,7 +300,7 @@ msgstr "Bagikan lewat tautan"
msgid "Password protect"
msgstr "Lindungi dengan sandi"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Sandi"
@@ -396,27 +403,24 @@ msgstr "Setel ulang sandi ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Email penyetelan ulang dikirim."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Permintaan gagal!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Nama pengguna"
+msgstr "Nama Pengguna"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Ajukan penyetelan ulang"
@@ -470,7 +474,7 @@ msgstr "Edit kategori"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "Tambah"
+msgstr "Tambahkan"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -516,43 +520,43 @@ msgstr "Buat sebuah <strong>akun admin</strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr "Lanjutan"
+msgstr "Tingkat Lanjut"
#: templates/installation.php:64
msgid "Data folder"
msgstr "Folder data"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfigurasikan basis data"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "akan digunakan"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Pengguna basis data"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Sandi basis data"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nama basis data"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tablespace basis data"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Host basis data"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Selesaikan instalasi"
@@ -560,42 +564,37 @@ msgstr "Selesaikan instalasi"
msgid "web services under your control"
msgstr "layanan web dalam kontrol Anda"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Keluar"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Masuk otomatis ditolak!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin dalam bahaya!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Lupa sandi?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "selalu masuk"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Masuk"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Cara Alternatif untuk Masuk"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index b7dcb610f8..cd5200faba 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
+# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +38,7 @@ msgstr "Tidak dapat mengubah nama berkas"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
+msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
@@ -78,19 +83,15 @@ msgstr "Direktori tidak valid."
msgid "Files"
msgstr "Berkas"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Bagikan"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Hapus secara permanen"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Hapus"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Ubah nama"
@@ -164,7 +165,7 @@ msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jik
#: js/files.js:259
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"
+msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau ukurannya 0 byte"
#: js/files.js:272
msgid "Not enough space available"
@@ -297,7 +298,7 @@ msgstr "Batalkan berbagi"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Yang diunggah terlalu besar"
+msgstr "Unggahan terlalu besar"
#: templates/index.php:110
msgid ""
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 0bcbac2567..752d0d3fa5 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index af35c34bf0..64d7c1ec65 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
msgid "Error configuring Google Drive storage"
msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Penyimpanan Eksternal"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 7e044193ad..2fb4cd8cb0 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# <romihardiyanto@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index d701cfac2e..03ff55760c 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +35,7 @@ msgstr "jalankan operasi pemulihan"
#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
msgid "Error"
-msgstr "Galat"
+msgstr "kesalahan"
#: js/trash.js:34
msgid "delete file permanently"
@@ -41,7 +43,7 @@ msgstr "hapus berkas secara permanen"
#: js/trash.js:121
msgid "Delete permanently"
-msgstr "Hapus secara permanen"
+msgstr "hapus secara permanen"
#: js/trash.js:174 templates/index.php:17
msgid "Name"
@@ -53,11 +55,11 @@ msgstr "Dihapus"
#: js/trash.js:184
msgid "1 folder"
-msgstr "1 folder"
+msgstr "1 map"
#: js/trash.js:186
msgid "{count} folders"
-msgstr "{count} folder"
+msgstr "{count} map"
#: js/trash.js:194
msgid "1 file"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 24b9a2f18c..a886cd3037 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 88c6934ad6..57352dd2b6 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mohamad Hasan Al Banna <se7entime@gmail.com>, 2013
+# elmakong <mr.pige_ina@yahoo.co.id>, 2012
+# rodin <romihardiyanto@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +116,72 @@ msgstr "%sAnda tidak boleh menggunakan karakter titik pada nama basis data"
msgid "%s set the database host."
msgstr "%s setel host basis data."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Galat Basis Data: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Perintah yang bermasalah: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Hapus pengguna ini dari MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Hapus pengguna ini dari MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
@@ -235,6 +238,19 @@ msgstr "tahun kemarin"
msgid "years ago"
msgstr "beberapa tahun lalu"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s tersedia. Dapatkan <a href=\"%s\">info lebih lanjut</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "terbaru"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "Pemeriksaan pembaruan dinonaktifkan."
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d462146a70..d9e1287658 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
+# Muhammad Panji <sumodirjo@gmail.com>, 2012.
+# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +27,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Tidak dapat memuat daftar dari App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Galat saat autentikasi"
+msgstr "Galat autentikasi"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Tidak dapat mengubah nama tampilan"
@@ -98,7 +100,7 @@ msgstr "Nonaktifkan"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "aktifkan"
+msgstr "Aktifkan"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +122,7 @@ msgstr "Gagal ketika memperbarui aplikasi"
msgid "Updated"
msgstr "Diperbarui"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Menyimpan..."
@@ -136,16 +138,16 @@ msgstr "urungkan"
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grup"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Hapus"
@@ -165,7 +167,7 @@ msgstr "Gagal membuat pengguna"
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -190,7 +192,7 @@ msgstr "Peringatan Persiapan"
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
+msgstr "Web server Anda belum dikonfigurasi untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
#: templates/admin.php:33
#, php-format
@@ -316,19 +318,19 @@ msgstr "Catat"
msgid "Log level"
msgstr "Level pencatatan"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Lainnya"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Ciutkan"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +401,7 @@ msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
msgid "Show First Run Wizard again"
msgstr "Tampilkan Penuntun Konfigurasi Awal"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Sandi"
@@ -423,70 +425,82 @@ msgstr "Sandi baru"
msgid "Change password"
msgstr "Ubah sandi"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nama Tampilan"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Nama tampilan Anda telah diubah"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Tidak dapat mengubah nama tampilan Anda"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Ubah nama tampilan"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Alamat email Anda"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nama Masuk"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Buat"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Penyimpanan Baku"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Tak terbatas"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Lainnya"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Penyimpanan"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "ubah nama tampilan"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "setel sandi baru"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 4a2648e5ce..f972150841 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mr.pige_ina@yahoo.co.id>, 2012.
+# <romihardiyanto@gmail.com>, 2013.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -39,7 +42,7 @@ msgstr "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya."
#: js/settings.js:66
msgid "Deletion failed"
-msgstr "Penghapusan gagal"
+msgstr "penghapusan gagal"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
@@ -92,7 +95,7 @@ msgstr "Tambah Konfigurasi Server"
#: templates/settings.php:36
msgid "Host"
-msgstr "Host"
+msgstr "host"
#: templates/settings.php:38
msgid ""
@@ -124,7 +127,7 @@ msgstr "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=a
#: templates/settings.php:46
msgid "Password"
-msgstr "Sandi"
+msgstr "kata kunci"
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
@@ -330,4 +333,4 @@ msgstr "Uji Konfigurasi"
#: templates/settings.php:99
msgid "Help"
-msgstr "Bantuan"
+msgstr "bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0fcf1d0e31..ba97904bd6 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <kaztraz@gmail.com>, 2012.
+# <sveinng@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -162,11 +164,11 @@ msgstr "Stillingar"
#: js/js.js:718
msgid "seconds ago"
-msgstr "sek."
+msgstr "sek sÃðan"
#: js/js.js:719
msgid "1 minute ago"
-msgstr "Fyrir 1 mÃnútu"
+msgstr "1 min sÃðan"
#: js/js.js:720
msgid "{minutes} minutes ago"
@@ -210,7 +212,7 @@ msgstr "sÃðasta ári"
#: js/js.js:730
msgid "years ago"
-msgstr "einhverjum árum"
+msgstr "árum sÃðan"
#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
msgid "Ok"
@@ -293,7 +295,7 @@ msgstr "Deila með veftengli"
msgid "Password protect"
msgstr "Verja með lykilorði"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Lykilorð"
@@ -396,27 +398,24 @@ msgstr "endursetja ownCloud lykilorð"
msgid "Use the following link to reset your password: {link}"
msgstr "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Þú munt fá veftengil à tölvupósti til að endursetja lykilorðið."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Beiðni um endursetningu send."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Beiðni mistókst!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Notendanafn"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Endursetja lykilorð"
@@ -438,7 +437,7 @@ msgstr "Endursetja lykilorð"
#: strings.php:5
msgid "Personal"
-msgstr "Um mig"
+msgstr "Persónustillingar"
#: strings.php:6
msgid "Users"
@@ -450,7 +449,7 @@ msgstr "Forrit"
#: strings.php:8
msgid "Admin"
-msgstr "Stjórnun"
+msgstr "Vefstjórn"
#: strings.php:9
msgid "Help"
@@ -470,7 +469,7 @@ msgstr "Breyta flokkum"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "Bæta við"
+msgstr "Bæta"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -522,37 +521,37 @@ msgstr "Ãtarlegt"
msgid "Data folder"
msgstr "Gagnamappa"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Stilla gagnagrunn"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "verður notað"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Gagnagrunns notandi"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Gagnagrunns lykilorð"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nafn gagnagrunns"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Töflusvæði gagnagrunns"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Netþjónn gagnagrunns"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Virkja uppsetningu"
@@ -560,42 +559,37 @@ msgstr "Virkja uppsetningu"
msgid "web services under your control"
msgstr "vefþjónusta undir þinni stjórn"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Útskrá"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Sjálfvirkri innskráningu hafnað!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Ef þú breyttir ekki lykilorðinu þÃnu fyrir skömmu, er mögulegt að einhver annar hafi komist inn á aðganginn þinn."
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Vinsamlegast breyttu lykilorðinu þÃnu til að tryggja öryggi þitt."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Týndir þú lykilorðinu?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "muna eftir mér"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "<strong>Skrá inn</strong>"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index c960499068..f2748bea44 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr "Ógild mappa."
msgid "Files"
msgstr "Skrár"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Deila"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Eyða"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Endurskýra"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 5c70420bc3..d1357c26c4 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index e92632bcfa..f4a26d339d 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "Gefðu upp virkan Dropbox lykil og leynikóða"
msgid "Error configuring Google Drive storage"
msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aðvörun:</b> \"smbclient\" er ekki uppsettur. Uppsetning á CIFS/SMB gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Aðvörun:</b> FTP stuðningur à PHP er ekki virkur. Uppsetning á FTP gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Ytri gagnageymsla"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index bd919a4af3..cab803385d 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 180cfb3bd3..8955f0bf36 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 0f8c3dd0c3..00eb5c1b8c 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 3aa394501c..c978737fb4 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# sveinn <sveinng@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +236,19 @@ msgstr "sÃðasta ári"
msgid "years ago"
msgstr "einhverjum árum"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s er à boði. Sækja <a href=\"%s\">meiri upplýsingar</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "nýjasta útgáfa"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "uppfærslupróf er ekki virkjað"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 6bc82b2944..7a60fd8a20 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ekki tókst að hlaða lista frá forrita sÃðu"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Villa við auðkenningu"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Er að vista ..."
@@ -136,16 +133,16 @@ msgstr "afturkalla"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Eyða"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__nafn_tungumáls__"
@@ -316,19 +313,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Meira"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Minna"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Lykilorð"
@@ -423,70 +420,82 @@ msgstr "Nýtt lykilorð"
msgid "Change password"
msgstr "Breyta lykilorði"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Netfang"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Netfangið þitt"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Tungumál"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Hjálpa við þýðingu"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þÃnu"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Búa til"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Sjálfgefin gagnageymsla"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ótakmarkað"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Annað"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "gagnapláss"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 707f5e9775..fa68224263 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sveinng@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 3d79a4e3e3..6eb124460f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -3,13 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# <cosenal@gmail.com>, 2011.
+# Francesco Apruzzese <cescoap@gmail.com>, 2011, 2012.
+# <marco@carnazzo.it>, 2011, 2012.
+# <pgcloud@imballaggi.net>, 2013.
+# <rb.colombo@gmail.com>, 2011.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -294,7 +299,7 @@ msgstr "Condividi con collegamento"
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Password"
@@ -352,11 +357,11 @@ msgstr "aggiornare"
#: js/share.js:331
msgid "delete"
-msgstr "elimina"
+msgstr "eliminare"
#: js/share.js:334
msgid "share"
-msgstr "condividi"
+msgstr "condividere"
#: js/share.js:368 js/share.js:564
msgid "Password protected"
@@ -397,27 +402,24 @@ msgstr "Ripristino password di ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Usa il collegamento seguente per ripristinare la password: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Riceverai un collegamento per ripristinare la tua password via email"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Email di ripristino inviata."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Richiesta non riuscita!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nome utente"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Richiesta di ripristino"
@@ -467,7 +469,7 @@ msgstr "Nuvola non trovata"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Modifica categorie"
+msgstr "Modifica le categorie"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -517,43 +519,43 @@ msgstr "Crea un <strong>account amministratore</strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr "Avanzat"
+msgstr "Avanzate"
#: templates/installation.php:64
msgid "Data folder"
msgstr "Cartella dati"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configura il database"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "sarà utilizzato"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Utente del database"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Password del database"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nome del database"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Spazio delle tabelle del database"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Host del database"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Termina la configurazione"
@@ -561,42 +563,37 @@ msgstr "Termina la configurazione"
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Esci"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Accesso automatico rifiutato."
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso."
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Hai perso la password?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "ricorda"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Accedi"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Accessi alternativi"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index f5ae1c2dbe..dc9bdc115b 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cosenal@gmail.com>, 2011.
+# Francesco Apruzzese <cescoap@gmail.com>, 2011.
+# <marco@carnazzo.it>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +41,7 @@ msgstr "Nessun file è stato inviato. Errore sconosciuto"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Non ci sono errori, il file è stato caricato correttamente"
+msgstr "Non ci sono errori, file caricato con successo"
#: ajax/upload.php:27
msgid ""
@@ -48,11 +52,11 @@ msgstr "Il file caricato supera la direttiva upload_max_filesize in php.ini:"
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
+msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Il file è stato caricato solo parzialmente"
+msgstr "Il file è stato parzialmente caricato"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -60,7 +64,7 @@ msgstr "Nessun file è stato caricato"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Manca una cartella temporanea"
+msgstr "Cartella temporanea mancante"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +82,15 @@ msgstr "Cartella non valida."
msgid "Files"
msgstr "File"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Condividi"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Elimina definitivamente"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Elimina"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Rinomina"
@@ -164,7 +164,7 @@ msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte"
+msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
#: js/files.js:272
msgid "Not enough space available"
@@ -297,7 +297,7 @@ msgstr "Rimuovi condivisione"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Caricamento troppo grande"
+msgstr "Il file caricato è troppo grande"
#: templates/index.php:110
msgid ""
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 6bd8dcce9a..22da6ecfe7 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +36,4 @@ msgstr "Escludi i seguenti tipi di file dalla cifratura:"
#: templates/settings.php:12
msgid "None"
-msgstr "Nessuno"
+msgstr "Nessuna"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index aeafcdb309..fb50f4d4d8 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
msgid "Error configuring Google Drive storage"
msgstr "Errore durante la configurazione dell'archivio Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Avviso:</b> il supporto Curl di PHP non è abilitato o non è installato. Impossibile montare condivisioni ownCloud / WebDAV o GoogleDrive. Chiedi all'amministratore di sistema di installarlo."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Archiviazione esterna"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 64e3b10980..86370c04ea 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 31244b0df3..a585ede393 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 9009790625..24390f266e 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index bf15d74fff..976a9ba859 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr "%s non dovresti utilizzare punti nel nome del database"
msgid "%s set the database host."
msgstr "%s imposta l'host del database."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome utente e/o password di PostgreSQL non validi"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "È necessario inserire un account esistente o l'amministratore."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nome utente e/o password di Oracle non validi"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nome utente e/o password di MySQL non validi"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Errore DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Il comando non consentito era: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'utente MySQL '%s'@'localhost' esiste già ."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Elimina questo utente da MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'utente MySQL '%s'@'%%' esiste già "
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Elimina questo utente da MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome utente e/o password MS SQL non validi: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
@@ -189,7 +190,7 @@ msgstr "secondi fa"
#: template.php:114
msgid "1 minute ago"
-msgstr "Un minuto fa"
+msgstr "1 minuto fa"
#: template.php:115
#, php-format
@@ -220,7 +221,7 @@ msgstr "%d giorni fa"
#: template.php:121
msgid "last month"
-msgstr "mese scorso"
+msgstr "il mese scorso"
#: template.php:122
#, php-format
@@ -229,12 +230,25 @@ msgstr "%d mesi fa"
#: template.php:123
msgid "last year"
-msgstr "anno scorso"
+msgstr "l'anno scorso"
#: template.php:124
msgid "years ago"
msgstr "anni fa"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s è disponibile. Ottieni <a href=\"%s\">ulteriori informazioni</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "aggiornato"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "il controllo degli aggiornamenti è disabilitato"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index bed35b9581..4e47bbc088 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <formalist@email.it>, 2012.
+# Francesco Apruzzese <cescoap@gmail.com>, 2011.
+# <icewind1991@gmail.com>, 2012.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# <marco@carnazzo.it>, 2011-2013.
+# <rb.colombo@gmail.com>, 2011.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +28,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Impossibile caricare l'elenco dall'App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Errore di autenticazione"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Il tuo nome visualizzato è stato cambiato."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Impossibile cambiare il nome visualizzato"
@@ -120,7 +123,7 @@ msgstr "Errore durante l'aggiornamento"
msgid "Updated"
msgstr "Aggiornato"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Salvataggio in corso..."
@@ -136,16 +139,16 @@ msgstr "annulla"
msgid "Unable to remove user"
msgstr "Impossibile rimuovere l'utente"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Gruppi"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppi amministrati"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Elimina"
@@ -165,7 +168,7 @@ msgstr "Errore durante la creazione dell'utente"
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Italiano"
@@ -316,19 +319,19 @@ msgstr "Log"
msgid "Log level"
msgstr "Livello di log"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Più"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Meno"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versione"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +402,7 @@ msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
msgid "Show First Run Wizard again"
msgstr "Mostra nuovamente la procedura di primo avvio"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Password"
@@ -423,70 +426,82 @@ msgstr "Nuova password"
msgid "Change password"
msgstr "Modifica password"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nome visualizzato"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Posta elettronica"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Il tuo nome visualizzato è stato cambiato"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Impossibile cambiare il tuo nome visualizzato"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Cambia il nome visualizzato"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Il tuo indirizzo email"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Lingua"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Migliora la traduzione"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nome utente"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Archiviazione predefinita"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Illimitata"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Altro"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Archiviazione"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "cambia il nome visualizzato"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "imposta una nuova password"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 55a4663df9..4cc1f41826 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index dd62994b1b..fd5f9d065c 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
+# <tetuyano+transi@gmail.com>, 2012.
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +297,7 @@ msgstr "URLリンクã§å…±æœ‰"
msgid "Password protect"
msgstr "パスワードä¿è·"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "パスワード"
@@ -396,27 +400,24 @@ msgstr "ownCloudã®ãƒ‘スワードをリセットã—ã¾ã™"
msgid "Use the following link to reset your password: {link}"
msgstr "パスワードをリセットã™ã‚‹ã«ã¯æ¬¡ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦ä¸‹ã•ã„: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "メールã§ãƒ‘スワードをリセットã™ã‚‹ãƒªãƒ³ã‚¯ãŒå±Šãã¾ã™ã€‚"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
-msgstr "ユーザーå"
+msgstr "ユーザå"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "リセットをè¦æ±‚ã—ã¾ã™ã€‚"
@@ -438,7 +439,7 @@ msgstr "パスワードをリセット"
#: strings.php:5
msgid "Personal"
-msgstr "個人"
+msgstr "個人è¨å®š"
#: strings.php:6
msgid "Users"
@@ -450,7 +451,7 @@ msgstr "アプリ"
#: strings.php:8
msgid "Admin"
-msgstr "管ç†"
+msgstr "管ç†è€…"
#: strings.php:9
msgid "Help"
@@ -522,80 +523,75 @@ msgstr "詳細è¨å®š"
msgid "Data folder"
msgstr "データフォルダ"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "データベースをè¨å®šã—ã¦ãã ã•ã„"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "ãŒä½¿ç”¨ã•ã‚Œã¾ã™"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "データベースã®ãƒ¦ãƒ¼ã‚¶å"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "データベースã®ãƒ‘スワード"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "データベースå"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "データベースã®è¡¨é ˜åŸŸ"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "データベースã®ãƒ›ã‚¹ãƒˆå"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "セットアップを完了ã—ã¾ã™"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "管ç†ä¸‹ã®ã‚¦ã‚§ãƒ–サービス"
+msgstr "管ç†ä¸‹ã«ã‚るウェブサービス"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "ãƒã‚°ã‚¢ã‚¦ãƒˆ"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "自動ãƒã‚°ã‚¤ãƒ³ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "最近パスワードを変更ã—ã¦ã„ãªã„å ´åˆã€ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯å±é™ºã«ã•ã‚‰ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "アカウントä¿è·ã®ç‚ºã€ãƒ‘スワードをå†åº¦ã®å¤‰æ›´ã‚’ãŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "パスワードを忘れã¾ã—ãŸã‹ï¼Ÿ"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "パスワードを記憶ã™ã‚‹"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "ãƒã‚°ã‚¤ãƒ³"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "代替ãƒã‚°ã‚¤ãƒ³"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index ef82ef3ed3..8348f354bd 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
+# <tetuyano+transi@gmail.com>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +53,11 @@ msgstr "アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯php.ini ã® upload_max_filesiz
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "アップãƒãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯HTMLフォームã§æŒ‡å®šã•ã‚ŒãŸ MAX_FILE_SIZE ã®åˆ¶é™ã‚’超ãˆã¦ã„ã¾ã™"
+msgstr "アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯HTMLã®ãƒ•ã‚©ãƒ¼ãƒ ã«è¨å®šã•ã‚ŒãŸMAX_FILE_SIZEã«è¨å®šã•ã‚ŒãŸã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "アップãƒãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯ä¸€éƒ¨åˆ†ã ã‘アップãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸ"
+msgstr "ファイルã¯ä¸€éƒ¨åˆ†ã—ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -60,7 +65,7 @@ msgstr "ファイルã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "一時ä¿å˜ãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+msgstr "テンãƒãƒ©ãƒªãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +83,21 @@ msgstr "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
msgid "Files"
msgstr "ファイル"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "共有"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "完全ã«å‰Šé™¤ã™ã‚‹"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "削除"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "åå‰ã®å¤‰æ›´"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "ä¸æ–"
+msgstr "ä¿ç•™"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -201,7 +202,7 @@ msgstr "サイズ"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "変更"
+msgstr "更新日時"
#: js/files.js:893
msgid "1 folder"
@@ -293,11 +294,11 @@ msgstr "ダウンãƒãƒ¼ãƒ‰"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "共有解除"
+msgstr "共有ã—ãªã„"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "アップãƒãƒ¼ãƒ‰ã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
+msgstr "ファイルサイズãŒå¤§ãã™ãŽã¾ã™"
#: templates/index.php:110
msgid ""
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 90764dc0da..474babe04a 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index ebea1cd842..ad9c4adb74 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "有効ãªDropboxアプリã®ã‚ーã¨ãƒ‘スワードを入力ã—ã¦ä¸‹
msgid "Error configuring Google Drive storage"
msgstr "Googleドライブストレージã®è¨å®šã‚¨ãƒ©ãƒ¼"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>è¦å‘Š:</b> \"smbclient\" ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。CIFS/SMB 共有ã®ãƒžã‚¦ãƒ³ãƒˆã¯ã§ãã¾ã›ã‚“。システム管ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ä¸‹ã•ã„。"
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>è¦å‘Š:</b> PHPã®FTPサãƒãƒ¼ãƒˆã¯ç„¡åŠ¹ã‚‚ã—ãã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。FTP共有ã®ãƒžã‚¦ãƒ³ãƒˆã¯ã§ãã¾ã›ã‚“。システム管ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ä¸‹ã•ã„。"
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>è¦å‘Š:</b> PHP ã® Curl サãƒãƒ¼ãƒˆã¯ç„¡åŠ¹ã‚‚ã—ãã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。ownCloud / WebDAV ã‚‚ã—ã㯠GoogleDrive ã®ãƒžã‚¦ãƒ³ãƒˆã¯ã§ãã¾ã›ã‚“。システム管ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ä¸‹ã•ã„。"
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "外部ストレージ"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index c6e1114ec1..443064306d 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index e3d441e887..2130acb86f 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 62a28eb62b..480fb5e1fe 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
+# <tetuyano+transi@gmail.com>, 2012.
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index a65b9bba76..8b2c637f42 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +26,7 @@ msgstr "ヘルプ"
#: app.php:362
msgid "Personal"
-msgstr "個人"
+msgstr "個人è¨å®š"
#: app.php:373
msgid "Settings"
@@ -39,7 +42,7 @@ msgstr "アプリ"
#: app.php:406
msgid "Admin"
-msgstr "管ç†"
+msgstr "管ç†è€…"
#: files.php:209
msgid "ZIP download is turned off."
@@ -113,72 +116,72 @@ msgstr "%s ã§ã¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹åã«ãƒ‰ãƒƒãƒˆã‚’利用ã§ããªã„ã‹ã‚‚ã—
msgid "%s set the database host."
msgstr "%s ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ›ã‚¹ãƒˆã‚’è¨å®šã—ã¾ã™ã€‚"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "æ—¢å˜ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚‚ã—ãã¯ç®¡ç†è€…ã®ã©ã¡ã‚‰ã‹ã‚’入力ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracleã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DBエラー: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "é•åコマンド: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'localhost' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'%%' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除ã™ã‚‹ã€‚"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "é•åコマンド: \"%s\"ã€åå‰: %sã€ãƒ‘スワード: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL サーãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å/パスワードãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "WebDAVインタフェースãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBサーãƒã¯ã¾ã ファイルã®åŒæœŸã‚’許å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>インストールガイド</a>をよã確èªã—ã¦ãã ã•ã„。"
@@ -189,7 +192,7 @@ msgstr "数秒å‰"
#: template.php:114
msgid "1 minute ago"
-msgstr "1 分å‰"
+msgstr "1分å‰"
#: template.php:115
#, php-format
@@ -220,7 +223,7 @@ msgstr "%d æ—¥å‰"
#: template.php:121
msgid "last month"
-msgstr "一月å‰"
+msgstr "先月"
#: template.php:122
#, php-format
@@ -229,12 +232,25 @@ msgstr "%d 分å‰"
#: template.php:123
msgid "last year"
-msgstr "一年å‰"
+msgstr "昨年"
#: template.php:124
msgid "years ago"
msgstr "å¹´å‰"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚<a href=\"%s\">è©³ç´°æƒ…å ±</a> を確èªãã ã•ã„"
+
+#: 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\""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index ab831462c4..065218b575 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -3,13 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
+# tt yn <tetuyano+transi@gmail.com>, 2012
+# tt yn <tetuyano+transi@gmail.com>, 2012
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-17 08:10+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -21,16 +26,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "アプリストアã‹ã‚‰ãƒªã‚¹ãƒˆã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "èªè¨¼ã‚¨ãƒ©ãƒ¼"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "表示åを変更ã§ãã¾ã›ã‚“"
@@ -68,7 +69,7 @@ msgstr "言語ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "ä¸æ£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆ"
+msgstr "無効ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆã§ã™"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -98,7 +99,7 @@ msgstr "無効"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "有効化"
+msgstr "有効"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +121,7 @@ msgstr "アプリã®æ›´æ–°ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿ"
msgid "Updated"
msgstr "更新済ã¿"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "ä¿å˜ä¸..."
@@ -136,16 +137,16 @@ msgstr "å…ƒã«æˆ»ã™"
msgid "Unable to remove user"
msgstr "ユーザを削除出æ¥ã¾ã›ã‚“"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "グループ"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "グループ管ç†è€…"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "削除"
@@ -165,7 +166,7 @@ msgstr "ユーザ作æˆã‚¨ãƒ©ãƒ¼"
msgid "A valid password must be provided"
msgstr "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Japanese (日本語)"
@@ -324,11 +325,11 @@ msgstr "ã‚‚ã£ã¨è¦‹ã‚‹"
msgid "Less"
msgstr "é–‰ã˜ã‚‹"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +400,7 @@ msgstr "ファイルをåŒæœŸã™ã‚‹ãŸã‚ã®ã‚¢ãƒ—リをå–å¾—"
msgid "Show First Run Wizard again"
msgstr "åˆå›žã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’å†è¡¨ç¤ºã™ã‚‹"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "パスワード"
@@ -413,80 +414,92 @@ msgstr "パスワードを変更ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: templates/personal.php:40
msgid "Current password"
-msgstr "Current password"
+msgstr "ç¾åœ¨ã®ãƒ‘スワード"
#: templates/personal.php:42
msgid "New password"
-msgstr "æ–°ã—ã„パスワードを入力"
+msgstr "æ–°ã—ã„パスワード"
#: templates/personal.php:44
msgid "Change password"
msgstr "パスワードを変更"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "表示å"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "メール"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "ã‚ãªãŸã®è¡¨ç¤ºåを変更ã—ã¾ã—ãŸ"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "ã‚ãªãŸã®è¡¨ç¤ºåを変更ã§ãã¾ã›ã‚“"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "表示åを変更"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "※パスワード回復を有効ã«ã™ã‚‹ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®å…¥åŠ›ãŒå¿…è¦ã§ã™"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "言語"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "翻訳ã«å”力ã™ã‚‹"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ファイルマãƒãƒ¼ã‚¸ãƒ£ã§ownCloudã«æŽ¥ç¶šã™ã‚‹éš›ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "ãƒã‚°ã‚¤ãƒ³å"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "作æˆ"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "デフォルトストレージ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "無制é™"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "ãã®ä»–"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "ストレージ"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "表示åを変更"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "æ–°ã—ã„パスワードをè¨å®š"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index d954d49116..d5116ad226 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
+# <tetuyano+transi@gmail.com>, 2012.
+# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 3840fc7208..63d4dff145 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 25301e504f..6dcd0b94c0 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr "ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 06cfd02260..357e27ab92 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_external.po b/l10n/ka/files_external.po
index a9eecf3b31..1d2bb5cb2b 100644
--- a/l10n/ka/files_external.po
+++ b/l10n/ka/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 9590d263fb..622310cbd5 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Lasha GeTto <getto379@mail.ru>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index 934d68261e..e26f005489 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_versions.po b/l10n/ka/files_versions.po
index fe02221e10..302be1bdbf 100644
--- a/l10n/ka/files_versions.po
+++ b/l10n/ka/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 26890fc56d..6051b7dcc6 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# GeoCybers <getto379@mail.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +236,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index d7da24759a..0a85ca4431 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index a6e12c17b8..1396bede36 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 7051022af7..17e56b13b3 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# drlinux64 <romeo@energo-pro.ge>, 2012
+# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 18:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -283,7 +285,7 @@ msgstr "გáƒáƒ–იáƒáƒ დრთქვენთვის {owner}–ის
#: js/share.js:159
msgid "Share with"
-msgstr "გáƒáƒáƒ–იáƒáƒ ე შემდეგით:"
+msgstr "გáƒáƒ£áƒ–იáƒáƒ ე"
#: js/share.js:164
msgid "Share with link"
@@ -293,7 +295,7 @@ msgstr "გáƒáƒ£áƒ–იáƒáƒ ე ლინკით"
msgid "Password protect"
msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ— დáƒáƒªáƒ•áƒ"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
@@ -331,7 +333,7 @@ msgstr "გáƒáƒ–იáƒáƒ დრ{item}–ში {user}–ის მიერ"
#: js/share.js:308
msgid "Unshare"
-msgstr "გáƒáƒ£áƒ–იáƒáƒ ებáƒáƒ“ი"
+msgstr "გáƒáƒ–იáƒáƒ ების მáƒáƒ®áƒ¡áƒœáƒ"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +398,24 @@ msgstr "ownCloud პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ"
msgid "Use the following link to reset your password: {link}"
msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე შემდეგი ლინკი პáƒáƒ áƒáƒšáƒ˜áƒ¡ შესáƒáƒªáƒ•áƒšáƒ”ლáƒáƒ“: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "თქვენ მáƒáƒ’ივáƒáƒ— პáƒáƒ áƒáƒšáƒ˜áƒ¡ შესáƒáƒªáƒ•áƒšáƒ”ლი ლინკი მეილზე"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
-msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლის მáƒáƒ—ხáƒáƒ•áƒœáƒ"
@@ -442,7 +441,7 @@ msgstr "პირáƒáƒ“ი"
#: strings.php:6
msgid "Users"
-msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი"
+msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლები"
#: strings.php:7
msgid "Apps"
@@ -450,7 +449,7 @@ msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბი"
#: strings.php:8
msgid "Admin"
-msgstr "áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი"
+msgstr "áƒáƒ“მინი"
#: strings.php:9
msgid "Help"
@@ -558,44 +557,39 @@ msgstr "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ˜áƒ¡ დáƒáƒ¡áƒ ულებáƒ"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "web services under your control"
+msgstr "თქვენი კáƒáƒœáƒ¢áƒ áƒáƒšáƒ˜áƒ¡ ქვეშ მყáƒáƒ¤áƒ˜ ვებ სერვისები"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ ი შესვლრუáƒáƒ ყáƒáƒ¤áƒ˜áƒšáƒ˜áƒ!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "თუ თქვენ áƒáƒ შეცვლით პáƒáƒ áƒáƒšáƒ¡, თქვენი áƒáƒœáƒ’áƒáƒ იში შეიძლებრიყáƒáƒ¡ დáƒáƒ¨áƒ•áƒ”ბáƒáƒ“ი სხვებისთვის"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "გთხáƒáƒ•áƒ— შეცვáƒáƒšáƒáƒ— თქვენი პáƒáƒ áƒáƒšáƒ˜, თქვენი áƒáƒœáƒ’áƒáƒ იშის დáƒáƒ¡áƒáƒªáƒáƒ•áƒáƒ“."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "დáƒáƒ’áƒáƒ•áƒ˜áƒ¬áƒ§áƒ“áƒáƒ— პáƒáƒ áƒáƒšáƒ˜?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "დáƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ ებáƒ"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "შესვლáƒ"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "áƒáƒšáƒ¢áƒ”რნáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ Login–ი"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index b20fd4c236..8750ca1cf1 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# drlinux64 <romeo@energo-pro.ge>, 2012
+# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:02+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-22 01:57+0200\n"
+"PO-Revision-Date: 2013-04-21 18:40+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,19 +80,15 @@ msgstr "დáƒáƒ£áƒ¨áƒ•áƒ”ბელი დირექტáƒáƒ იáƒ."
msgid "Files"
msgstr "ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "გáƒáƒ–იáƒáƒ ებáƒ"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "სრულáƒáƒ“ წáƒáƒ¨áƒšáƒ"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "გáƒáƒ“áƒáƒ ქმევáƒ"
@@ -293,7 +291,7 @@ msgstr "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "გáƒáƒ£áƒ–იáƒáƒ ებáƒáƒ“ი"
+msgstr "გáƒáƒ–იáƒáƒ ების მáƒáƒ®áƒ¡áƒœáƒ"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 6678dd7cc5..538122996f 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 203e29f7c0..29e278e6e5 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:03+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,26 +38,19 @@ msgstr "გთხáƒáƒ•áƒ— მიუთითáƒáƒ— Dropbox áƒáƒžáƒšáƒ˜áƒ™áƒ
msgid "Error configuring Google Drive storage"
msgstr "შეცდáƒáƒ›áƒ Google Drive სáƒáƒªáƒáƒ•áƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜áƒ’ურირების დრáƒáƒ¡"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>გáƒáƒ¤áƒ თხილებáƒ:</b> \"smbclient\" áƒáƒ áƒáƒ ის ინსტáƒáƒšáƒ˜áƒ ებული. CIFS/SMB ზიáƒáƒ ების მáƒáƒœáƒ¢áƒ˜áƒ ებრშეუძლებელიáƒ. გთხáƒáƒ•áƒ— თხáƒáƒ•áƒáƒ— თქვენს სისტემურáƒáƒ“მინისტრáƒáƒ¢áƒáƒ ებს დáƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ ის."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>გáƒáƒ¤áƒ თხილებáƒ:</b> FTP მხáƒáƒ დáƒáƒáƒ”რრáƒáƒ áƒáƒ ის áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ ი áƒáƒœ დáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ ებული. FTP ზიáƒáƒ ის მáƒáƒœáƒ¢áƒ˜áƒ ებრშეუძლებელიáƒ. გთხáƒáƒ•áƒ— თხáƒáƒ•áƒáƒ— თქვენს სისტემურáƒáƒ“მინისტრáƒáƒ¢áƒáƒ ებს დáƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ ის."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>გáƒáƒ¤áƒ თხილებáƒ:</b>PHP–ის Curl მხáƒáƒ დáƒáƒáƒ”რრáƒáƒ áƒáƒ ის ჩáƒáƒ თული áƒáƒœ ინსტáƒáƒšáƒ˜áƒ ებული. ownCloud / WebDAV áƒáƒœ GoogleDrive–ის მáƒáƒœáƒ¢áƒ˜áƒ ებრშეუძლებელიáƒ. თხáƒáƒ•áƒ”თ თქვენს áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ს დáƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ ის."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "ექსტერნáƒáƒš სáƒáƒªáƒáƒ•áƒ˜"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 2cd7702bc6..968899752d 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <romeo@energo-pro.ge>, 2012.
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:03+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 592898b1ea..5938528d4d 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 18:40+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 87f15b8179..13de4c38f4 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:02+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index af7df55b76..ff6c7f4124 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# drlinux64 <romeo@energo-pro.ge>, 2012
+# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +115,72 @@ msgstr "%s áƒáƒ მიუთითáƒáƒ— წერტილი ბáƒáƒ–ის
msgid "%s set the database host."
msgstr "%s მიუთითეთ ბáƒáƒ–ის ჰáƒáƒ¡áƒ¢áƒ˜."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "თქვენ უნდრშეიყვáƒáƒœáƒáƒ— áƒáƒ სებული მáƒáƒ›áƒ®áƒ›áƒáƒ ებელის სáƒáƒ®áƒ”ლი áƒáƒœ áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB შეცდáƒáƒ›áƒ: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Offending ბრძáƒáƒœáƒ”ბრიყáƒ: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი '%s'@'localhost' უკვე áƒáƒ სებáƒáƒ‘ს."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "წáƒáƒ¨áƒáƒšáƒ” ეს მáƒáƒ›áƒ®áƒáƒ›áƒ ებელი MySQL–იდáƒáƒœ"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი '%s'@'%%' უკვე áƒáƒ სებáƒáƒ‘ს"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "წáƒáƒ¨áƒáƒšáƒ” ეს მáƒáƒ›áƒ®áƒáƒ›áƒ ებელი MySQL–იდáƒáƒœ"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Offending ბრძáƒáƒœáƒ”ბრიყáƒ: \"%s\", სáƒáƒ®áƒ”ლი: %s, პáƒáƒ áƒáƒšáƒ˜: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის მáƒáƒ თებული: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "თქვენი web სერვერი áƒáƒ áƒáƒ ის კáƒáƒœáƒ¤áƒ˜áƒ’ურირებული ფáƒáƒ˜áƒš სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის, რáƒáƒ“გáƒáƒœ WebDAV ინტერფეისი შეიძლებრიყáƒáƒ¡ გáƒáƒ¢áƒ”ხილი."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "გთხáƒáƒ•áƒ— გáƒáƒ“áƒáƒáƒ—ვáƒáƒšáƒ˜áƒ”რáƒáƒ— <a href='%s'>ინსტáƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ გზáƒáƒ›áƒ™áƒ•áƒšáƒ”ვი</a>."
@@ -235,6 +237,19 @@ msgstr "ბáƒáƒšáƒ წელს"
msgid "years ago"
msgstr "წლის წინ"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ხელმისáƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ. მიიღეთ <a href=\"%s\">უფრრმეტი ინფáƒáƒ მáƒáƒªáƒ˜áƒ</a>"
+
+#: 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\""
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 734eede528..899e32ba84 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# drlinux64 <romeo@energo-pro.ge>, 2012
# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-22 01:58+0200\n"
+"PO-Revision-Date: 2013-04-21 18:40+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +23,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბის სირვერჩáƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თრApp Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "áƒáƒ•áƒ—ენტიფიკáƒáƒªáƒ˜áƒ˜áƒ¡ შეცდáƒáƒ›áƒ"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "თქვენი დისფლეის სáƒáƒ®áƒ”ლი უკვე შეიცვáƒáƒšáƒ"
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "დისფლეის სáƒáƒ®áƒ”ლის შეცვლრვერმáƒáƒ®áƒ”რხდáƒ"
@@ -121,7 +118,7 @@ msgstr "შეცდáƒáƒ›áƒ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒš
msgid "Updated"
msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "შენáƒáƒ®áƒ•áƒ..."
@@ -137,16 +134,16 @@ msgstr "დáƒáƒ‘რუნებáƒ"
msgid "Unable to remove user"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
-msgstr "ჯგუფები"
+msgstr "ჯგუფი"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "ჯგუფის áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
@@ -166,7 +163,7 @@ msgstr "შეცდáƒáƒ›áƒ მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის შექმ
msgid "A valid password must be provided"
msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული პáƒáƒ áƒáƒšáƒ˜"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -323,13 +320,13 @@ msgstr "უფრრმეტი"
#: templates/admin.php:228
msgid "Less"
-msgstr "უფრრნáƒáƒ™áƒšáƒ”ბი"
+msgstr "naklebi"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr "ვერსიáƒ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +397,7 @@ msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ”ბის სინქრáƒ
msgid "Show First Run Wizard again"
msgstr "მáƒáƒ©áƒ•áƒ”ნე თáƒáƒ•áƒ˜áƒ“áƒáƒœ გáƒáƒ¨áƒ•áƒ”ბული ვიზáƒáƒ დი"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
@@ -424,70 +421,82 @@ msgstr "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜"
msgid "Change password"
msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "დისპლეის სáƒáƒ®áƒ”ლი"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "დისფლეის სáƒáƒ®áƒ”ლი შეიცვáƒáƒšáƒ"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "თქვენი დისფლეის სáƒáƒ®áƒ”ლის შეცვლრვერმáƒáƒ®áƒ”რხდáƒ"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "დისფლეის სáƒáƒ®áƒ”ლის შეცვლáƒ"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "იმეილი"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "თქვენი იმეილ მისáƒáƒ›áƒáƒ თი"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "შეáƒáƒ•áƒ¡áƒ”თ იმეილ მისáƒáƒ›áƒáƒ თის ველი პáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒáƒ¦áƒ¡áƒáƒ“გენáƒáƒ“"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "ენáƒ"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "თáƒáƒ გმნის დáƒáƒ®áƒ›áƒáƒ ებáƒ"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე შემდეგი მისáƒáƒ›áƒáƒ თი ownCloud–თáƒáƒœ დáƒáƒ¡áƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ ებლáƒáƒ“ შენს ფáƒáƒ˜áƒšáƒ›áƒ”ნეჯერში"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "შექმნáƒ"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ სáƒáƒªáƒáƒ•áƒ˜"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "ულიმიტáƒ"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "სხვáƒ"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "სáƒáƒªáƒáƒ•áƒ˜"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "შეცვáƒáƒšáƒ” დისფლეის სáƒáƒ®áƒ”ლი"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "დáƒáƒáƒ§áƒ”ნეთ áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ პáƒáƒ áƒáƒ›áƒ”ტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index cdc9f72873..6931493d23 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index b412b63b1f..481dd8e0bb 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 7e61c23fc1..1345b2d0fe 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 602b35e3e8..dba23393ea 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index d73e3f29a7..ed14ed557d 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index 17f0921f70..e561733a10 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 1886595cea..12ddf3ce85 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_versions.po b/l10n/kn/files_versions.po
index 33d7a4a3b2..c15d71b56c 100644
--- a/l10n/kn/files_versions.po
+++ b/l10n/kn/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 8bc47e9ad2..836abc39cd 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 034be72d0d..c49b26512b 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 3b3ac191a8..76ed5e5bc5 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 2e8b6e43eb..a4c7b6bbb9 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -3,13 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Shinjo Park <kde@peremen.name>, 2013
+# <aoiob4305@gmail.com>, 2013.
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# <limonade83@gmail.com>, 2012.
+# Park Shinjo <kde@peremen.name>, 2013.
+# Shinjo Park <kde@peremen.name>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -53,7 +57,7 @@ msgstr "ì¶”ê°€í• ë¶„ë¥˜ê°€ 없습니까?"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr "분류가 ì´ë¯¸ 존재합니다: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -74,7 +78,7 @@ msgstr "ì±…ê°ˆí”¼ì— %sì„(를) ì¶”ê°€í• ìˆ˜ 없었습니다."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "ì‚ì œí• ë¶„ë¥˜ë¥¼ ì„ íƒí•˜ì§€ 않았습니다. "
+msgstr "ì‚ì œí• ë¶„ë¥˜ë¥¼ ì„ íƒí•˜ì§€ 않았습니다."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -294,7 +298,7 @@ msgstr "URL ë§í¬ë¡œ ê³µìœ "
msgid "Password protect"
msgstr "암호 보호"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "암호"
@@ -344,7 +348,7 @@ msgstr "ì ‘ê·¼ ì œì–´"
#: js/share.js:325
msgid "create"
-msgstr "ìƒì„±"
+msgstr "만들기"
#: js/share.js:328
msgid "update"
@@ -397,27 +401,24 @@ msgstr "ownCloud 암호 ìž¬ì„¤ì •"
msgid "Use the following link to reset your password: {link}"
msgstr "ë‹¤ìŒ ë§í¬ë¥¼ 사용하여 암호를 ìž¬ì„¤ì •í• ìˆ˜ 있습니다: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "ì´ë©”ì¼ë¡œ 암호 ìž¬ì„¤ì • ë§í¬ë¥¼ 보냈습니다."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "ì‚¬ìš©ìž ì´ë¦„"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "ìš”ì² ì´ˆê¸°í™”"
@@ -467,7 +468,7 @@ msgstr "í´ë¼ìš°ë“œë¥¼ ì°¾ì„ ìˆ˜ 없습니다"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "분류 ìˆ˜ì •"
+msgstr "분류 편집"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -480,11 +481,11 @@ msgstr "보안 ê²½ê³ "
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "사용 ì¤‘ì¸ PHP ë²„ì „ì´ NULL ë°”ì´íŠ¸ ê³µê²©ì— ì·¨ì•½í•©ë‹ˆë‹¤ (CVE-2006-7243)"
+msgstr ""
#: templates/installation.php:26
msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ownCloudì˜ ë³´ì•ˆì„ ìœ„í•˜ì—¬ PHP ë²„ì „ì„ ì—…ë°ì´íŠ¸í•˜ì‹ì‹œì˜¤."
+msgstr ""
#: templates/installation.php:32
msgid ""
@@ -502,14 +503,14 @@ msgstr "ì•ˆì „í•œ 난수 ìƒì„±ê¸°ë¥¼ 사용하지 않으면 공격ìžê°€ 암호
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ".htaccess 파ì¼ì´ 처리ë˜ì§€ ì•Šì•„ì„œ ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ 파ì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í• ìˆ˜ ì—†ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
+msgstr ""
#: templates/installation.php:40
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
"target=\"_blank\">documentation</a>."
-msgstr "서버를 올바르게 ì„¤ì •í•˜ëŠ” ë°©ë²•ì„ ì•Œì•„ë³´ë ¤ë©´ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">문서</a>를 ì°¸ê³ í•˜ì‹ì‹œì˜¤.."
+msgstr ""
#: templates/installation.php:44
msgid "Create an <strong>admin account</strong>"
@@ -523,37 +524,37 @@ msgstr "ê³ ê¸‰"
msgid "Data folder"
msgstr "ë°ì´í„° í´ë”"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì„¤ì •"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "사용ë ì˜ˆì •"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ 사용ìž"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ 암호"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì´ë¦„"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ í…Œì´ë¸” 공간"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ 호스트"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "설치 완료"
@@ -561,44 +562,39 @@ msgstr "설치 완료"
msgid "web services under your control"
msgstr "내가 관리하는 웹 서비스"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "로그아웃"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "ìžë™ 로그ì¸ì´ 거부ë˜ì—ˆìŠµë‹ˆë‹¤!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "ìµœê·¼ì— ì•”í˜¸ë¥¼ 변경하지 않았다면 ê³„ì •ì´ íƒˆì·¨ë˜ì—ˆì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "ê³„ì •ì˜ ì•ˆì „ì„ ìœ„í•˜ì—¬ 암호를 변경하ì‹ì‹œì˜¤."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "암호를 잊으셨습니까?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "기억하기"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "로그ì¸"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
-msgstr "대체 "
+msgstr ""
#: templates/part.pagenavi.php:3
msgid "prev"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 32901091a7..08e22f63b5 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aoiob4305@gmail.com>, 2013.
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Harim Park <fofwisdom@gmail.com>, 2013.
+# <limonade83@gmail.com>, 2012.
+# Park Shinjo <kde@peremen.name>, 2013.
+# Shinjo Park <kde@peremen.name>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +43,7 @@ msgstr "파ì¼ì´ 업로드ë˜ì§€ 않았습니다. ì•Œ 수 없는 오류입니
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "íŒŒì¼ ì—…ë¡œë“œì— ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤."
+msgstr "ì—…ë¡œë“œì— ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤."
#: ajax/upload.php:27
msgid ""
@@ -48,19 +54,19 @@ msgstr "업로드한 파ì¼ì´ php.iniì˜ upload_max_filesize보다 í½ë‹ˆë‹¤:"
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "업로드한 íŒŒì¼ í¬ê¸°ê°€ HTML í¼ì˜ MAX_FILE_SIZE보다 í¼"
+msgstr "업로드한 파ì¼ì´ HTML ë¬¸ì„œì— ì§€ì •í•œ MAX_FILE_SIZE보다 ë” í¼"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "파ì¼ì˜ ì¼ë¶€ë¶„만 업로드ë¨"
+msgstr "파ì¼ì´ 부분ì 으로 업로드ë¨"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "파ì¼ì´ 업로드ë˜ì§€ 않았ìŒ"
+msgstr "ì—…ë¡œë“œëœ íŒŒì¼ ì—†ìŒ"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "ìž„ì‹œ í´ë”ê°€ ì—†ìŒ"
+msgstr "ìž„ì‹œ í´ë”ê°€ 사ë¼ì§"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +84,21 @@ msgstr "올바르지 ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤."
msgid "Files"
msgstr "파ì¼"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "ê³µìœ "
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "ì‚ì œ"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "ì´ë¦„ 바꾸기"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "대기 중"
+msgstr "보류 중"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -120,7 +122,7 @@ msgstr "{old_name}ì´(ê°€) {new_name}(으)ë¡œ 대체ë¨"
#: js/filelist.js:299
msgid "undo"
-msgstr "ë˜ëŒë¦¬ê¸°"
+msgstr "실행 취소"
#: js/filelist.js:324
msgid "perform delete operation"
@@ -164,7 +166,7 @@ msgstr "다운로드가 준비 중입니다. íŒŒì¼ í¬ê¸°ê°€ í¬ë‹¤ë©´ 시간
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ë””ë ‰í„°ë¦¬ ë° ë¹ˆ 파ì¼ì€ ì—…ë¡œë“œí• ìˆ˜ 없습니다"
+msgstr "ì´ íŒŒì¼ì€ ë””ë ‰í„°ë¦¬ì´ê±°ë‚˜ 비어 있기 ë•Œë¬¸ì— ì—…ë¡œë“œí• ìˆ˜ 없습니다"
#: js/files.js:272
msgid "Not enough space available"
@@ -297,7 +299,7 @@ msgstr "ê³µìœ í•´ì œ"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "업로드한 파ì¼ì´ 너무 í¼"
+msgstr "업로드 용량 초과"
#: templates/index.php:110
msgid ""
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 432f5ed625..9a2fc1b35b 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Shinjo Park <kde@peremen.name>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 05f9ba418c..b2dbdea9bd 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aoiob4305@gmail.com>, 2013.
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Park Shinjo <peremen@gmail.com>, 2013.
+# Shinjo Park <kde@peremen.name>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +41,19 @@ msgstr "올바른 Dropbox 앱 키와 암호를 ìž…ë ¥í•˜ì‹ì‹œì˜¤."
msgid "Error configuring Google Drive storage"
msgstr "Google ë“œë¼ì´ë¸Œ ì €ìž¥ì†Œ ì„¤ì • 오류"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>ê²½ê³ :</b> \"smbclient\"ê°€ 설치ë˜ì§€ 않았습니다. CIFS/SMB ê³µìœ ìžì›ì— ì—°ê²°í• ìˆ˜ 없습니다. 시스템 관리ìžì—게 설치를 ìš”ì²í•˜ì‹ì‹œì˜¤."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>ê²½ê³ :</b> PHP FTP 지ì›ì´ 비활성화ë˜ì–´ 있거나 설치ë˜ì§€ 않았습니다. FTP ê³µìœ ë¥¼ ë§ˆìš´íŠ¸í• ìˆ˜ 없습니다. 시스템 관리ìžì—게 설치를 ìš”ì²í•˜ì‹ì‹œì˜¤."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "외부 ì €ìž¥ì†Œ"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 245187c115..9810e11baf 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Park Shinjo <kde@peremen.name>, 2013.
+# Shinjo Park <kde@peremen.name>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index b2f9321e0e..fae4215410 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index b3241be267..101de33dbe 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Shinjo Park <kde@peremen.name>, 2012.
+# Sung Jin Gang <potopro@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 06d9e41f52..2c97ea10db 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012
+# Shinjo Park <kde@peremen.name>, 2013
+# Shinjo Park <kde@peremen.name>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +116,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +238,19 @@ msgstr "ìž‘ë…„"
msgid "years ago"
msgstr "ë…„ ì „"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%sì„(를) ì‚¬ìš©í• ìˆ˜ 있습니다. <a href=\"%s\">ìžì„¸í•œ ì •ë³´ 보기</a>"
+
+#: 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\""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 6e2db6fcc8..098a8eef8f 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aoiob4305@gmail.com>, 2013.
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Harim Park <fofwisdom@gmail.com>, 2013.
+# <limonade83@gmail.com>, 2012.
+# Shinjo Park <kde@peremen.name>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +26,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "앱 ìŠ¤í† ì–´ì—ì„œ 목ë¡ì„ ê°€ì ¸ì˜¬ 수 없습니다"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "ì¸ì¦ 오류"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -98,7 +99,7 @@ msgstr "비활성화"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "사용함"
+msgstr "활성화"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +121,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "ì €ìž¥ 중..."
@@ -136,16 +137,16 @@ msgstr "ë˜ëŒë¦¬ê¸°"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "그룹"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "그룹 관리ìž"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "ì‚ì œ"
@@ -165,7 +166,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "í•œêµì–´"
@@ -235,7 +236,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "í¬ë¡ "
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -310,25 +311,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "로그"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "로그 단계"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "ë” ì¤‘ìš”í•¨"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "ëœ ì¤‘ìš”í•¨"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "ë²„ì „"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +400,7 @@ msgstr "ì•±ì„ ì´ìš©í•˜ì—¬ ë‹¹ì‹ ì˜ íŒŒì¼ì„ ë™ê¸°í™” í• ìˆ˜ 있습니다."
msgid "Show First Run Wizard again"
msgstr "첫 실행 마법사 다시 ë³´ì´ê¸°"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "암호"
@@ -423,70 +424,82 @@ msgstr "새 암호"
msgid "Change password"
msgstr "암호 변경"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "표시 ì´ë¦„"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "ì´ë©”ì¼"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "ì´ë©”ì¼ ì£¼ì†Œ"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "암호 찾기 ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤."
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "언어"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "ë²ˆì— ë•ê¸°"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "íŒŒì¼ ê´€ë¦¬ìžì—ì„œ ownCloudì— ì ‘ì†í•˜ë ¤ë©´ ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "ë¡œê·¸ì¸ ì´ë¦„"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "만들기"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "기본 ì €ìž¥ì†Œ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "ë¬´ì œí•œ"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "기타"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "ì €ìž¥ì†Œ"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "표시 ì´ë¦„ 변경"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "새 암호 ì„¤ì •"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index e08a48a9b5..12de201d71 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aoiob4305@gmail.com>, 2013.
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
+# Harim Park <fofwisdom@gmail.com>, 2013.
+# Shinjo Park <kde@peremen.name>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 4be0cb61d8..214b67e0c4 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <itkurd0@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -396,27 +397,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "ناوی به‌کارهێنه‌ر"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +520,37 @@ msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
msgid "Data folder"
msgstr "زانیاری Ùۆڵده‌ر"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "به‌كارهێنه‌ری داتابه‌یس"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "وشه‌ی نهێنی داتا به‌یس"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "ناوی داتابه‌یس"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "هۆستی داتابه‌یس"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "كۆتایی هات ده‌ستكاریه‌كان"
@@ -560,42 +558,37 @@ msgstr "كۆتایی هات ده‌ستكاریه‌كان"
msgid "web services under your control"
msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "چوونەدەرەوە"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 0eab1067b2..1ea4fe01e8 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index c961a1e23d..afa8a7eff0 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hozha Koyi <hozhan@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index ff019f8366..0ebebe4074 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 291c1ca15a..5294fa1042 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hozha Koyi <hozhan@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "وشەی تێپەربو"
+msgstr "تێپه‌ڕه‌وشه"
#: templates/authenticate.php:6
msgid "Submit"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index c875155aa9..466bf259a3 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index 0b3811c2a5..8f2cdbd21e 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hozha Koyi <hozhan@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +51,7 @@ msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "وه‌شان"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 2bf8387dbb..ba160fa439 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "به‌كارهێنه‌ر"
#: app.php:398
msgid "Apps"
-msgstr "به‌رنامه‌كان"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a59db52635..2c83b2fbbf 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "پاشکه‌وتده‌کات..."
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -423,70 +419,82 @@ msgstr "وشەی نهێنی نوێ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "ئیمه‌یل"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 4830e9d27a..cc74bf7a41 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "وشەی تێپەربو"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 297e614c2b..f7fd085575 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sim0n@trypill.org>, 2013.
+# <sim0n@trypill.org>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +295,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Passwuert"
@@ -396,27 +398,24 @@ msgstr "ownCloud Passwuert reset"
msgid "Use the following link to reset your password: {link}"
msgstr "Benotz folgende Link fir däi Passwuert ze reseten: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Benotzernumm"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Reset ufroen"
@@ -470,7 +469,7 @@ msgstr "Kategorien editéieren"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "Dobäisetzen"
+msgstr "Bäisetzen"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -522,37 +521,37 @@ msgstr "Avancéiert"
msgid "Data folder"
msgstr "Daten Dossier"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Datebank konfiguréieren"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "wärt benotzt ginn"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Datebank Benotzer"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Datebank Passwuert"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Datebank Numm"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Datebank Tabelle-Gréisst"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Datebank Server"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Installatioun ofschléissen"
@@ -560,42 +559,37 @@ msgstr "Installatioun ofschléissen"
msgid "web services under your control"
msgstr "Web Servicer ënnert denger Kontroll"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Ausloggen"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Passwuert vergiess?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "verhalen"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Log dech an"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 9c56c3d4da..8aa5780abd 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sim0n@trypill.org>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -56,7 +57,7 @@ msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Et ass kee Fichier ropgeluede ginn"
+msgstr "Et ass keng Datei ropgelueden ginn"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +79,15 @@ msgstr ""
msgid "Files"
msgstr "Dateien"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Deelen"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Läschen"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
@@ -289,7 +286,7 @@ msgstr "Hei ass näischt. Lued eppes rop!"
#: templates/index.php:76
msgid "Download"
-msgstr "Download"
+msgstr "Eroflueden"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 09f6598370..0632e6b5ab 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 2461cbdaeb..e0bf824f95 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
@@ -99,7 +92,7 @@ msgstr "Gruppen"
#: templates/settings.php:100
msgid "Users"
-msgstr "Benotzer"
+msgstr ""
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 8905aedf43..a8c12d1704 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr "Passwuert"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Fortschécken"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Download"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "Web Servicer ënnert denger Kontroll"
+msgstr ""
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 5533290894..046e687bd2 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 7745e418c1..0daea383b9 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sim0n@trypill.org>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 6060004b52..b1b27935b8 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -31,11 +31,11 @@ msgstr "Astellungen"
#: app.php:385
msgid "Users"
-msgstr "Benotzer"
+msgstr ""
#: app.php:398
msgid "Apps"
-msgstr "Applicatiounen"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr "Läscht Joer"
msgid "years ago"
msgstr "Joren hier"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 8e088e758a..c657f9b728 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sim0n@trypill.org>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Konnt Lescht net vum App Store lueden"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Authentifikatioun's Fehler"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Speicheren..."
@@ -136,16 +133,16 @@ msgstr "réckgängeg man"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppen Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Läschen"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -235,7 +232,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -259,15 +256,15 @@ msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Share API aschalten"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "Erlab Apps d'Share API ze benotzen"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "Links erlaben"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
@@ -275,7 +272,7 @@ msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "Resharing erlaben"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
@@ -283,11 +280,11 @@ msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "Useren erlaben mat egal wiem ze sharen"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +307,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Log"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr "Méi"
+msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Passwuert"
@@ -423,70 +420,82 @@ msgstr "Neit Passwuert"
msgid "Change password"
msgstr "Passwuert änneren"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Deng Email Adress"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Sprooch"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Hëllef iwwersetzen"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Erstellen"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Aner"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index f6e6bd009a..43ff3ad1b1 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index ad40286f05..ad04a7e8c8 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <andrejuszl@gmail.com>, 2012.
+# Dr. ROX <to.dr.rox@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +295,7 @@ msgstr "Dalintis nuoroda"
msgid "Password protect"
msgstr "Apsaugotas slaptažodžiu"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Slaptažodis"
@@ -331,7 +333,7 @@ msgstr "Pasidalino {item} su {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "Nebesidalinti"
+msgstr "Nesidalinti"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +398,24 @@ msgstr "ownCloud slaptažodžio atkūrimas"
msgid "Use the following link to reset your password: {link}"
msgstr "Slaptažodio atkūrimui naudokite šią nuorodą: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Prisijungimo vardas"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Prašyti nustatymo iš najo"
@@ -522,37 +521,37 @@ msgstr "IÅ¡plÄ—stiniai"
msgid "Data folder"
msgstr "Duomenų katalogas"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Nustatyti duomenų bazę"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "bus naudojama"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Duomenų bazės vartotojas"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Duomenų bazės slaptažodis"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Duomenų bazės pavadinimas"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Duomenų bazės loginis saugojimas"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Duomenų bazės serveris"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Baigti diegimÄ…"
@@ -560,42 +559,37 @@ msgstr "Baigti diegimÄ…"
msgid "web services under your control"
msgstr "jūsų valdomos web paslaugos"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Atsijungti"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatinis prisijungimas atmestas!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Pamiršote slaptažodį?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "prisiminti"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Prisijungti"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 2178a80a06..7bc5f5a3e2 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <andrejuszl@gmail.com>, 2012.
+# Denisas Kulumbegašvili <>, 2012.
+# Dr. ROX <to.dr.rox@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +40,7 @@ msgstr ""
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Failas įkeltas sėkmingai, be klaidų"
+msgstr "Klaidų nėra, failas įkeltas sėkmingai"
#: ajax/upload.php:27
msgid ""
@@ -48,7 +51,7 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje."
+msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -56,7 +59,7 @@ msgstr "Failas buvo įkeltas tik dalinai"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nebuvo įkeltas joks failas"
+msgstr "Nebuvo įkeltas nė vienas failas"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +81,15 @@ msgstr ""
msgid "Files"
msgstr "Failai"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Dalintis"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "IÅ¡trinti"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Pervadinti"
@@ -303,7 +302,7 @@ msgstr "Įkėlimui failas per didelis"
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
+msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
#: templates/index.php:115
msgid "Files are being scanned, please wait."
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 0ee0533579..a3629e2cc4 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dr. ROX <to.dr.rox@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 4e0ad2de01..de18742d78 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <andrejuszl@gmail.com>, 2012.
+# Dr. ROX <to.dr.rox@gmail.com>, 2012.
+# Mindaugas <min2lizz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
msgid "Error configuring Google Drive storage"
msgstr "Klaida nustatinÄ—jant Google Drive talpyklÄ…"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Įspėjimas:</b> \"smbclient\" nėra įdiegtas. CIFS/SMB dalinimasis nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas \"smbclient\""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Įspėjimas:</b> FTP palaikymas PHP sistemoje nėra įjungtas arba nėra įdiegtas. FTP dalinimosi įjungimas nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas FTP palaikymas. "
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "IÅ¡orinÄ—s saugyklos"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 3b808b3735..a2553793fb 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dr. ROX <to.dr.rox@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +20,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Slaptažodis"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "IÅ¡saugoti"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +38,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Atsisiųsti"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +46,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "jūsų valdomos web paslaugos"
+msgstr ""
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 77bed8165a..f427f0e01f 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 57d518462c..1572027742 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <andrejuszl@gmail.com>, 2012.
+# Dr. ROX <to.dr.rox@gmail.com>, 2012.
+# Mindaugas <min2lizz@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 91b409910d..a176e307e6 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# andrejuseu <andrejuszl@gmail.com>, 2012
+# Dr. ROX <to.dr.rox@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -113,83 +115,83 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
#: template.php:113
msgid "seconds ago"
-msgstr "prieš sekundę"
+msgstr "prieš kelias sekundes"
#: template.php:114
msgid "1 minute ago"
-msgstr "Prieš 1 minutę"
+msgstr "prieš 1 minutę"
#: template.php:115
#, php-format
@@ -220,7 +222,7 @@ msgstr "prieš %d dienų"
#: template.php:121
msgid "last month"
-msgstr "praeitą mėnesį"
+msgstr "praėjusį mėnesį"
#: template.php:122
#, php-format
@@ -229,12 +231,25 @@ msgstr ""
#: template.php:123
msgid "last year"
-msgstr "praeitais metais"
+msgstr "pereitais metais"
#: template.php:124
msgid "years ago"
msgstr "prieš metus"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s yra galimas. PlatesnÄ— <a href=\"%s\">informacija Äia</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "pilnai atnaujinta"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "atnaujinimų tikrinimas išjungtas"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 164db54bc9..79929cea32 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <andrejuszl@gmail.com>, 2012.
+# Dr. ROX <to.dr.rox@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +23,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Autentikacijos klaida"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,9 +118,9 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Saugoma..."
+msgstr "Saugoma.."
#: js/users.js:43
msgid "deleted"
@@ -136,16 +134,16 @@ msgstr "anuliuoti"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "GrupÄ—s"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "IÅ¡trinti"
@@ -165,7 +163,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Kalba"
@@ -235,7 +233,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -255,7 +253,7 @@ msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Dalijimasis"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
@@ -310,25 +308,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Žurnalas"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Žurnalo išsamumas"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Daugiau"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Mažiau"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +397,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Slaptažodis"
@@ -423,70 +421,82 @@ msgstr "Naujas slaptažodis"
msgid "Change password"
msgstr "Pakeisti slaptažodį"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "El. Paštas"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "El. paštas"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Jūsų el. pašto adresas"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Kalba"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Padėkite išversti"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Sukurti"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Kita"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 26af0dbe27..a27f44400d 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dr. ROX <to.dr.rox@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index ed8d247b10..921311120e 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aldis@udris.lv>, 2012.
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +75,7 @@ msgstr "Kļūda, pievienojot %s izlasei."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Neviena kategorija nav izvēlēta dzēšanai."
+msgstr "Neviena kategorija nav izvēlēta dzēšanai"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -293,7 +295,7 @@ msgstr "Dalīties ar saiti"
msgid "Password protect"
msgstr "AizsargÄt ar paroli"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Parole"
@@ -331,7 +333,7 @@ msgstr "DalÄ«jÄs ar {item} ar {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "PÄrtraukt dalÄ«Å¡anos"
+msgstr "Beigt dalīties"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +398,24 @@ msgstr "ownCloud paroles maiņa"
msgid "Use the following link to reset your password: {link}"
msgstr "Izmantojiet šo saiti, lai mainītu paroli: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "JÅ«s savÄ epastÄ saņemsiet interneta saiti, caur kuru varÄ“siet atjaunot paroli."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Atstatīt e-pasta sūtīšanu."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "PieprasÄ«jums neizdevÄs!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "LietotÄjvÄrds"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Pieprasīt paroles maiņu"
@@ -450,7 +449,7 @@ msgstr "Lietotnes"
#: strings.php:8
msgid "Admin"
-msgstr "Administratori"
+msgstr "Administrators"
#: strings.php:9
msgid "Help"
@@ -522,37 +521,37 @@ msgstr "PaplaÅ¡inÄti"
msgid "Data folder"
msgstr "Datu mape"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "KonfigurÄ“t datubÄzi"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "tiks izmantots"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "DatubÄzes lietotÄjs"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "DatubÄzes parole"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "DatubÄzes nosaukums"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "DatubÄzes tabulas telpa"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "DatubÄzes serveris"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Pabeigt iestatīšanu"
@@ -560,42 +559,37 @@ msgstr "Pabeigt iestatīšanu"
msgid "web services under your control"
msgstr "tÄ«mekļa servisi tavÄ varÄ"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Izrakstīties"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "AutomÄtiskÄ ierakstÄ«Å¡anÄs ir noraidÄ«ta!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Ja neesat pÄ“dÄ“jÄ laikÄ mainÄ«jis paroli, iespÄ“jams, ka jÅ«su konts ir kompromitÄ“ts."
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "LÅ«dzu, nomainiet savu paroli, lai atkal nodroÅ¡inÄtu savu kontu."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "AizmirsÄt paroli?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "atcerēties"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Ierakstīties"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "AlternatÄ«vÄs pieteikÅ¡anÄs"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index f4d2f07452..de2375feaa 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aldis@udris.lv>, 2012.
+# Imants Liepiņš <imzzinator@gmail.com>, 2012.
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +40,7 @@ msgstr "Netika augÅ¡upielÄdÄ“ta neviena datne. NezinÄma kļūda"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Viss kÄrtÄ«bÄ, datne augÅ¡upielÄdÄ“ta veiksmÄ«ga"
+msgstr "AugÅ¡upielÄde pabeigta bez kļūdÄm"
#: ajax/upload.php:27
msgid ""
@@ -78,19 +81,15 @@ msgstr "Nederīga direktorija."
msgid "Files"
msgstr "Datnes"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Dalīties"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Dzēst pavisam"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Dzēst"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "PÄrsaukt"
@@ -164,7 +163,7 @@ msgstr "Tiek sagatavota lejupielÄde. Tas var aizņemt kÄdu laiciņu, ja datnes
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄ ir 0 baitu liela"
+msgstr "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄs izmÄ“rs ir 0 baiti"
#: js/files.js:272
msgid "Not enough space available"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index cc34243949..2b049a1c7e 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 8f0bcb6261..0c6f652630 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "LÅ«dzu, norÄdiet derÄ«gu Dropbox lietotnes atslÄ“gu un noslÄ“pumu."
msgid "Error configuring Google Drive storage"
msgstr "Kļūda, konfigurÄ“jot Google Drive krÄtuvi"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>BrÄ«dinÄjums:</b> nav uzinstalÄ“ts “smbclientâ€. Nevar montÄ“t CIFS/SMB koplietojumus. LÅ«dzu, vaicÄjiet savam sistÄ“mas administratoram, lai to uzinstalÄ“."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>BrÄ«dinÄjums: </b> uz PHP nav aktivÄ“ts vai instalÄ“ts FTP atbalsts. Nevar montÄ“t FTP koplietojumus. LÅ«dzu, vaicÄjiet savam sistÄ“mas administratoram, lai to uzinstalÄ“."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Ä€rÄ“jÄ krÄtuve"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index c3369954b8..eba98a874e 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -45,4 +46,4 @@ msgstr "Nav pieejams priekšskatījums priekš"
#: templates/public.php:50
msgid "web services under your control"
-msgstr "tÄ«mekļa servisi tavÄ varÄ"
+msgstr "jÅ«su vadÄ«bÄ esoÅ¡ie tÄ«mekļa servisi"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 46290b2436..66670fca8c 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 7b0e211dbf..9c9098fdd9 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index c14518b06c..7db941c050 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr "%s datubĞu nosaukumos nedrīkst izmantot punktus"
msgid "%s set the database host."
msgstr "%s iestatiet datubÄžu serveri."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nav derÄ«ga PostgreSQL parole un/vai lietotÄjvÄrds"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Jums jÄievada vai nu esoÅ¡s vai administratora konts."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nav derÄ«ga Oracle parole un/vai lietotÄjvÄrds"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB kļūda — “%sâ€"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "VainÄ«gÄ komanda bija “%sâ€"
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL lietotÄjs %s'@'localhost' jau eksistÄ“."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Izmest Å¡o lietotÄju no MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL lietotÄjs '%s'@'%%' jau eksistÄ“"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Izmest Å¡o lietotÄju no MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "VainÄ«gÄ komanda bija \"%s\", vÄrds: %s, parole: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds — %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai ļautu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "LÅ«dzu, vÄ“lreiz pÄrbaudiet <a href='%s'>instalÄ“Å¡anas palÄ«dzÄ«bu</a>."
@@ -235,6 +236,19 @@ msgstr "gÄjuÅ¡ajÄ gadÄ"
msgid "years ago"
msgstr "gadus atpakaļ"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ir pieejams. IegÅ«t <a href=\"%s\">vairÄk informÄcijas</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "ir aktuÄls"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "atjauninÄjumu pÄrbaude ir deaktivÄ“ta"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 2fd80f4858..fd7f24987d 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aldis@udris.lv>, 2012.
+# <elwins@inbox.lv>, 2012.
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nevar lejupielÄdÄ“t sarakstu no lietotņu veikala"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "AutentifikÄcijas kļūda"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "NevarÄ“ja mainÄ«t redzamo vÄrdu"
@@ -68,7 +67,7 @@ msgstr "Valoda tika nomainīta"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "NederÄ«gs vaicÄjums"
+msgstr "Nederīgs pieprasījums"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +119,7 @@ msgstr "Kļūda, atjauninot lietotni"
msgid "Updated"
msgstr "AtjauninÄta"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "SaglabÄ..."
@@ -136,16 +135,16 @@ msgstr "atsaukt"
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotÄju"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Dzēst"
@@ -165,7 +164,7 @@ msgstr "Kļūda, veidojot lietotÄju"
msgid "A valid password must be provided"
msgstr "JÄnorÄda derÄ«ga parole"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__valodas_nosaukums__"
@@ -316,19 +315,19 @@ msgstr "ŽurnÄls"
msgid "Log level"
msgstr "ŽurnÄla lÄ«menis"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "VairÄk"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "MazÄk"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
msgid "Show First Run Wizard again"
msgstr "VÄ“lreiz rÄdÄ«t pirmÄs palaiÅ¡anas vedni"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Parole"
@@ -423,70 +422,82 @@ msgstr "Jauna parole"
msgid "Change password"
msgstr "Mainīt paroli"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Redzamais vÄrds"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "JÅ«su redzamais vÄrds tika mainÄ«ts"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "NevarÄ“ja mainÄ«t jÅ«su redzamo vÄrdu"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "MainÄ«t redzamo vÄrdu"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-pasts"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "JÅ«su e-pasta adrese"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Ievadiet e-pasta adresi, lai vÄ“lÄk varÄ“tu atgÅ«t paroli, ja bÅ«s nepiecieÅ¡amÄ«ba"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Valoda"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Palīdzi tulkot"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Izmanto Å¡o adresi, lai, izmantojot datņu pÄrvaldnieku, savienotos ar savu ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "IerakstÄ«Å¡anÄs vÄrds"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Izveidot"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "NoklusÄ“juma krÄtuve"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Neierobežota"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Cits"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "KrÄtuve"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "mainÄ«t redzamo vÄrdu"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "iestatīt jaunu paroli"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 100f2ca501..d90ac74dcb 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index cca6e22f55..81face26f6 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -158,7 +161,7 @@ msgstr "Декември"
#: js/js.js:286
msgid "Settings"
-msgstr "ПодеÑувања"
+msgstr "ПоÑтавки"
#: js/js.js:718
msgid "seconds ago"
@@ -293,7 +296,7 @@ msgstr "Сподели Ñо врÑка"
msgid "Password protect"
msgstr "Заштити Ñо лозинка"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Лозинка"
@@ -396,27 +399,24 @@ msgstr "реÑетирање на лозинка за ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "КориÑтете ја Ñледната врÑка да ја реÑетирате Вашата лозинка: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Ќе добиете врÑка по е-пошта за да може да ја реÑетирате Вашата лозинка."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "КориÑничко име"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Побарајте реÑетирање"
@@ -446,7 +446,7 @@ msgstr "КориÑници"
#: strings.php:7
msgid "Apps"
-msgstr "Ðппликации"
+msgstr "Ðпликации"
#: strings.php:8
msgid "Admin"
@@ -522,37 +522,37 @@ msgstr "Ðапредно"
msgid "Data folder"
msgstr "Фолдер Ñо податоци"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Конфигурирај ја базата"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "ќе биде кориÑтено"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "КориÑник на база"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Лозинка на база"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Име на база"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Табела во базата на податоци"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Сервер Ñо база"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Заврши го подеÑувањето"
@@ -560,42 +560,37 @@ msgstr "Заврши го подеÑувањето"
msgid "web services under your control"
msgstr "веб ÑервиÑи под Ваша контрола"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Одјава"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Одбиена автоматÑка најава!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Ðко не Ñте ја промениле лозинката во Ñкоро време, вашата Ñметка може да е компромитирана"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Ве молам Ñменете ја лозинката да ја обезбедите вашата Ñметка повторно."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ја заборавивте лозинката?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "запамти"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Ðајава"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index ee5a7fa3ff..f6c46aea44 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +40,7 @@ msgstr "Ðиту еден фајл не Ñе вчита. Ðепозната гр
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Датотеката беше уÑпешно подигната."
+msgstr "Ðема грешка, датотеката беше подигната уÑпешно"
#: ajax/upload.php:27
msgid ""
@@ -48,7 +51,7 @@ msgstr "Подигнатата датотека ја надминува upload_m
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше Ñпецифицирана во HTML формата"
+msgstr "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поÑтавена во HTML формата"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -56,11 +59,11 @@ msgstr "Датотеката беше Ñамо делумно подигната
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Ðе беше подигната датотека."
+msgstr "Ðе беше подигната датотека"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "ÐедоÑтаÑува привремена папка"
+msgstr "Ðе поÑтои привремена папка"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +81,15 @@ msgstr ""
msgid "Files"
msgstr "Датотеки"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Сподели"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Избриши"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Преименувај"
@@ -297,7 +296,7 @@ msgstr "Ðе Ñподелувај"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Фајлот кој Ñе вчитува е преголем"
+msgstr "Датотеката е премногу голема"
#: templates/index.php:110
msgid ""
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 42d168af09..2d19fc1765 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index c1d7e75e2e..fe3c349323 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "Ве молам доÑтавите валиден Dropbox клуч и Ñ‚
msgid "Error configuring Google Drive storage"
msgstr "Грешка при конфигурација на Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Внимание:</b> \"smbclient\" не е инÑталиран. Ðе е можно монтирање на CIFS/SMB диÑкови. Замолете го Вашиот ÑиÑтем админиÑтратор да го инÑталира."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Внимание:</b> Ðе е овозможена или инÑталирани FTP подршка во PHP. Ðе е можно монтирање на FTP диÑкови. Замолете го Вашиот ÑиÑтем админиÑтратор да го инÑталира."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Ðадворешно Ñкладиште"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 34a139dd73..8f8d15bd33 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 53216a98de..5b9f5e38ca 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index a25f7e9a24..0f47e5a9dd 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index e64e413995..2dfafad88e 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +28,7 @@ msgstr "Лично"
#: app.php:373
msgid "Settings"
-msgstr "ПодеÑувања"
+msgstr "Параметри"
#: app.php:385
msgid "Users"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +236,19 @@ msgstr "минатата година"
msgid "years ago"
msgstr "пред години"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s е доÑтапно. Земи <a href=\"%s\">повеќе информации</a>"
+
+#: 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\""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 7e664ae61d..6294b438af 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
+# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ðеможам да вчитам лиÑта од App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Грешка во автентикација"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -68,7 +67,7 @@ msgstr "Јазикот е Ñменет"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Ðеправилно барање"
+msgstr "неправилно барање"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +119,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Снимам..."
@@ -136,16 +135,16 @@ msgstr "врати"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "ÐдминиÑтратор на група"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Избриши"
@@ -165,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -310,25 +309,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "ЗапиÑник"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Ðиво на логирање"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Повеќе"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Лозинка"
@@ -423,70 +422,82 @@ msgstr "Ðова лозинка"
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Вашата адреÑа за е-пошта"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Пополни ја адреÑата за е-пошта за да може да ја обновуваш лозинката"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Јазик"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "КориÑтете ја оваа адреÑа да "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Создај"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "ОÑтанато"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 92d9c35763..bf3591d3a7 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 4559ef41db..f15ffdc57f 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
+# <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +76,7 @@ msgstr ""
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Tiada kategori dipilih untuk dibuang."
+msgstr "tiada kategori dipilih untuk penghapusan"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -293,7 +296,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Kata laluan"
@@ -396,27 +399,24 @@ msgstr "Set semula kata lalaun ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nama pengguna"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Permintaan set semula"
@@ -466,7 +466,7 @@ msgstr "Awan tidak dijumpai"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Ubah kategori"
+msgstr "Edit kategori"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -522,37 +522,37 @@ msgstr "Maju"
msgid "Data folder"
msgstr "Fail data"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfigurasi pangkalan data"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "akan digunakan"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Nama pengguna pangkalan data"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Kata laluan pangkalan data"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nama pangkalan data"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Hos pangkalan data"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Setup selesai"
@@ -560,42 +560,37 @@ msgstr "Setup selesai"
msgid "web services under your control"
msgstr "Perkhidmatan web di bawah kawalan anda"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Log keluar"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Hilang kata laluan?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "ingat"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Log masuk"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index ffc6777c0f..e6c9a00ff3 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
+# <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +41,7 @@ msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
+msgstr "Tiada ralat, fail berjaya dimuat naik."
#: ajax/upload.php:27
msgid ""
@@ -48,19 +52,19 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
+msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Fail yang dimuatnaik tidak lengkap"
+msgstr "Sebahagian daripada fail telah dimuat naik. "
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Tiada fail dimuatnaik"
+msgstr "Tiada fail yang dimuat naik"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Direktori sementara hilang"
+msgstr "Folder sementara hilang"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -76,21 +80,17 @@ msgstr ""
#: appinfo/app.php:12
msgid "Files"
-msgstr "Fail-fail"
+msgstr "fail"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Kongsi"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Padam"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
@@ -193,7 +193,7 @@ msgstr "Ralat"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "Nama"
+msgstr "Nama "
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -297,7 +297,7 @@ msgstr ""
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Muatnaik terlalu besar"
+msgstr "Muat naik terlalu besar"
#: templates/index.php:110
msgid ""
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 15afa59d32..9515dfd0de 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index f1af46895a..8ecc367a1e 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index e2dd173597..db23a1af3f 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Kata laluan"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Hantar"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Muat turun"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "Perkhidmatan web di bawah kawalan anda"
+msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 8eaef7bab2..8c4564ff8d 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 22e8fd7432..6f1366cd61 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 7d00ce42b9..d40a40daf2 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "Pengguna"
#: app.php:398
msgid "Apps"
-msgstr "Aplikasi"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index b86d2eb41b..53d5141ad2 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
+# <hadri.hilmi@gmail.com>, 2011, 2012.
+# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +25,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Ralat pengesahan"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +120,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Simpan..."
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Kumpulan"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Padam"
@@ -165,7 +165,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_nama_bahasa_"
@@ -310,25 +310,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Log"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Tahap Log"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr "Lanjutan"
+msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +399,9 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
-msgstr "Kata laluan"
+msgstr "Kata laluan "
#: templates/personal.php:38
msgid "Your password was changed"
@@ -423,70 +423,82 @@ msgstr "Kata laluan baru"
msgid "Change password"
msgstr "Ubah kata laluan"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "Emel"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Alamat emel anda"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Bantu terjemah"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Buat"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Lain"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index f8d3c3c7fb..f99ce5db09 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "Kata laluan"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 46e82a3f92..86a5d60cc6 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Pyae Sone <gipsyhnh@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "စကားá€á€¾á€€á€º"
@@ -396,27 +397,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "အီးမေးလ်မှá€á€…်ဆင့် သင်áစကားá€á€¾á€€á€ºá€€á€á€¯ ပြန်ဖော်ရန်အá€á€½á€€á€º Link á€á€…်á€á€¯á€œá€€á€ºá€á€¶á€›á€›á€¾á€á€•á€«á€œá€á€™á€·á€ºá€™á€šá€ºá‹"
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "အီးမေးလ်မှá€á€…်ဆင့် သင်áစကားá€á€¾á€€á€ºá€€á€á€¯ ပြန်ဖော်ရန်အá€á€½á€€á€º Link á€á€…်á€á€¯á€œá€€á€ºá€á€¶á€›á€›á€¾á€á€•á€«á€œá€á€™á€·á€ºá€™á€šá€ºá‹"
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "သုံးစွဲသူအမည်"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +520,37 @@ msgstr "အဆင့်မြင့်"
msgid "Data folder"
msgstr "အá€á€»á€€á€ºá€¡á€œá€€á€ºá€–á€á€¯á€œá€ºá€’ါလ်"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Database သုံးစွဲသူ"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Database စကားá€á€¾á€€á€º"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Database အမည်"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "á€á€•á€ºá€†á€„်á€á€¼á€„်းပြီးပါပြီá‹"
@@ -560,42 +558,37 @@ msgstr "á€á€•á€ºá€†á€„်á€á€¼á€„်းပြီးပါပြီá‹"
msgid "web services under your control"
msgstr "သင်áထá€á€”်းá€á€»á€¯á€•á€ºá€™á€¾á€¯á€·á€¡á€±á€¬á€€á€ºá€á€½á€„်ရှá€á€žá€±á€¬ Web services"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "သင်áစကားá€á€¾á€€á€ºá€•á€»á€±á€¬á€€á€ºá€žá€½á€¬á€¸á€•á€¼á€®á€œá€¬á€¸á‹"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "မှá€á€ºá€™á€á€…ေသည်"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "á€á€„်ရောက်ရန်"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index c524b59a4c..1c3bdb9087 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr "ဖá€á€¯á€„်များ"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 0980592321..8187a95657 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index d6fae81ea2..3eb55f030a 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 1105b88661..548c22898b 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 9107081978..dbf8725846 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
index 57a0f93840..a2ba5e272d 100644
--- a/l10n/my_MM/files_versions.po
+++ b/l10n/my_MM/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index f6ebed8ec4..01231da96e 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Pyae Sone <gipsyhnh@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +236,19 @@ msgstr "မနှစ်က"
msgid "years ago"
msgstr "နှစ် အရင်က"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ကá€á€¯á€›á€›á€¾á€á€”á€á€¯á€„်ပါပြီዠ<a href=\"%s\">နောက်ထပ်အá€á€»á€€á€ºá€¡á€œá€€á€ºá€™á€»á€¬á€¸</a>ရယူပါá‹"
+
+#: 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\""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 0a56eeb646..3b64f4963b 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "á€á€½á€„့်ပြုá€á€»á€€á€ºá€™á€¡á€±á€¬á€„်မြင်"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "စကားá€á€¾á€€á€º"
@@ -423,70 +419,82 @@ msgstr "စကားá€á€¾á€€á€ºá€¡á€žá€…်"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 67429168c1..11909d9de1 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index fb7fcade40..3a4eaba426 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <ajarmund@gmail.com>, 2011, 2012.
+# Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel <i18n@daniel.priv.no>, 2012.
+# <espenbye@me.com>, 2012.
+# <hdalgrav@gmail.com>, 2012.
+# <itssmail@yahoo.no>, 2012.
+# <runesudden@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +300,7 @@ msgstr "Del med link"
msgid "Password protect"
msgstr "Passordbeskyttet"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Passord"
@@ -396,27 +403,24 @@ msgstr "Tilbakestill ownCloud passord"
msgid "Use the following link to reset your password: {link}"
msgstr "Bruk følgende lenke for å tilbakestille passordet ditt: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Brukernavn"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Anmod tilbakestilling"
@@ -522,80 +526,75 @@ msgstr "Avansert"
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "vil bli brukt"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Databasebruker"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Databasepassord"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Databasenavn"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Database tabellområde"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Databasevert"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Fullfør oppsetting"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "web tjenester du kontrollerer"
+msgstr "nettjenester under din kontroll"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Logg ut"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatisk pålogging avvist!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Mistet passordet ditt?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "husk"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Logg inn"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index a7f905b651..270f2a77d9 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -3,12 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <ajarmund@gmail.com>, 2011, 2012.
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+# Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel <i18n@daniel.priv.no>, 2012.
+# <espenbye@me.com>, 2012.
+# <hdalgrav@gmail.com>, 2012.
+# <olamaekle@gmail.com>, 2012.
+# <runesudden@gmail.com>, 2012.
+# <sindre@haverstad.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +46,7 @@ msgstr "Ingen filer ble lastet opp. Ukjent feil."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
+msgstr "Det er ingen feil. Filen ble lastet opp."
#: ajax/upload.php:27
msgid ""
@@ -48,19 +57,19 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
+msgstr "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
+msgstr "Filopplastningen ble bare delvis gjennomført"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Ingen filer ble lastet opp"
+msgstr "Ingen fil ble lastet opp"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Mangler midlertidig mappe"
+msgstr "Mangler en midlertidig mappe"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +87,15 @@ msgstr ""
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Del"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Slett permanent"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Slett"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Omdøp"
@@ -132,7 +137,7 @@ msgstr "1 fil lastes opp"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "filer lastes opp"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -297,7 +302,7 @@ msgstr "Avslutt deling"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Filen er for stor"
+msgstr "Opplasting for stor"
#: templates/index.php:110
msgid ""
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 7fca6d3980..a4f3b39ecb 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+# <oyvind.hojem@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 00e13b6447..24d044818d 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <ajarmund@gmail.com>, 2012.
+# <oyvind.hojem@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Ekstern lagring"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index ab1517bb3f..aab4069ed7 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+# <hdalgrav@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 1e5a285a90..dde092aba9 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ivar Bredesen <ivar.bredesen@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 2c4717260a..5f9387a60f 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+# <hdalgrav@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +52,7 @@ msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "Versjoner"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1b6be2e344..5228fc0a44 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012
+# espenbye <espenbye@me.com>, 2012
+# hdalgrav <hdalgrav@gmail.com>, 2012
+# runesudden <runesudden@gmail.com>, 2012
+# sindrejh <sindre@haverstad.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +72,7 @@ msgstr "Applikasjon er ikke påslått"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
+msgstr "Autentiseringsfeil"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,72 +118,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -229,12 +234,25 @@ msgstr "%d måneder siden"
#: template.php:123
msgid "last year"
-msgstr "forrige år"
+msgstr "i fjor"
#: template.php:124
msgid "years ago"
msgstr "Ã¥r siden"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s er tilgjengelig. FÃ¥ <a href=\"%s\">mer informasjon</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "oppdatert"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "versjonssjekk er avslått"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index a00278adbd..4f57396323 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <ajarmund@gmail.com>, 2011.
+# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+# Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel <i18n@daniel.priv.no>, 2012.
+# <espenbye@me.com>, 2012.
+# <hdalgrav@gmail.com>, 2012.
+# <itssmail@yahoo.no>, 2012.
+# <runesudden@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +29,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Lasting av liste fra App Store feilet."
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Autentikasjonsfeil"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -98,7 +102,7 @@ msgstr "Slå avBehandle "
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Aktiver"
+msgstr "Slå på"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +124,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Lagrer..."
@@ -136,16 +140,16 @@ msgstr "angre"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Slett"
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -235,7 +239,7 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
@@ -255,7 +259,7 @@ msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Deling"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
@@ -267,11 +271,11 @@ msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "Tillat lenker"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "Tillat brukere å dele filer med lenker"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
@@ -279,15 +283,15 @@ msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "Tillat brukere å dele med alle"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "Tillat kun deling med andre brukere i samme gruppe"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +314,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Logg"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Loggnivå"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Mer"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +403,7 @@ msgstr "Få dine apps til å synkronisere dine filer"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Passord"
@@ -423,70 +427,82 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endre passord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Epost"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "E-post"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Din e-postadresse"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Oppi epostadressen du vil tilbakestille passordet for"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Bidra til oversettelsen"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Opprett"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Annet"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 643c1a84bf..3102274ae5 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <hdalgrav@gmail.com>, 2012.
+# Ivar Bredesen <ivar.bredesen@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index c5b6a57bbb..fb5ac097bd 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 1bd24b1346..186deace5c 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 4eb8d284c4..adf3985dab 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index 5b2e2ed597..bacdd21335 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 6905b432c8..e18a1db2d7 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 3775730782..16034c1cb4 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_versions.po b/l10n/ne/files_versions.po
index 3f57c723bc..234a1c0d8f 100644
--- a/l10n/ne/files_versions.po
+++ b/l10n/ne/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index bf5c92bdbf..44cf09325b 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 20957a953f..90251cee26 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 871723423d..a589c8483d 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 9694e44327..391f1ef71e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -3,13 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2012-2013.
+# <bart.formosus@gmail.com>, 2011.
+# <didi.debian@cknow.org>, 2012.
+# Erik Bent <hj.bent.60@gmail.com>, 2012.
+# <icewind1991@gmail.com>, 2011.
+# <jos@gelauff.net>, 2012.
+# <koen@vervloesem.eu>, 2011.
+# <lenny@weijl.org>, 2012.
+# Martin Wildeman <mhwildeman@gmail.com>, 2012.
+# <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@gmail.com>, 2012.
+# <transifex@thisnet.nl>, 2012.
+# <translator@it-dept.eu>, 2012.
+# <webbsite-mark@hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -219,7 +232,7 @@ msgstr "Ok"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Annuleer"
+msgstr "Annuleren"
#: js/oc-dialogs.js:185
msgid "Choose"
@@ -294,7 +307,7 @@ msgstr "Deel met link"
msgid "Password protect"
msgstr "Wachtwoord beveiliging"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Wachtwoord"
@@ -344,7 +357,7 @@ msgstr "toegangscontrole"
#: js/share.js:325
msgid "create"
-msgstr "creëer"
+msgstr "maak"
#: js/share.js:328
msgid "update"
@@ -397,27 +410,24 @@ msgstr "ownCloud wachtwoord herstellen"
msgid "Use the following link to reset your password: {link}"
msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Reset e-mail verstuurd."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Verzoek mislukt!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Gebruikersnaam"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Resetaanvraag"
@@ -431,7 +441,7 @@ msgstr "Naar de login-pagina"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "Nieuw"
+msgstr "Nieuw wachtwoord"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -467,7 +477,7 @@ msgstr "Cloud niet gevonden"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Wijzig categorieën"
+msgstr "Wijzigen categorieën"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -523,37 +533,37 @@ msgstr "Geavanceerd"
msgid "Data folder"
msgstr "Gegevensmap"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configureer de database"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "zal gebruikt worden"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Gebruiker database"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Wachtwoord database"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Naam database"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Database server"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Installatie afronden"
@@ -561,42 +571,37 @@ msgstr "Installatie afronden"
msgid "web services under your control"
msgstr "Webdiensten in eigen beheer"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Afmelden"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatische aanmelding geweigerd!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Uw wachtwoord vergeten?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "onthoud gegevens"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Meld je aan"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternatieve inlogs"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f1d984cf41..a3c69c4f2d 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -3,12 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2012-2013.
+# <bart.formosus@gmail.com>, 2011.
+# <bartv@thisnet.nl>, 2011.
+# <didi.debian@cknow.org>, 2012.
+# Erik Bent <hj.bent.60@gmail.com>, 2012.
+# <icewind1991@gmail.com>, 2011.
+# <jos@gelauff.net>, 2012.
+# <koen@vervloesem.eu>, 2011.
+# <lenny@weijl.org>, 2012.
+# <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@gmail.com>, 2012.
+# Wilfred Dijksman <info@wdijksman.nl>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +49,7 @@ msgstr "Er was geen bestand geladen. Onbekende fout"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "De upload van het bestand is goedgegaan."
+msgstr "Geen fout opgetreden, bestand successvol geupload."
#: ajax/upload.php:27
msgid ""
@@ -48,19 +60,19 @@ msgstr "Het geüploade bestand overscheidt de upload_max_filesize optie in php.i
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
+msgstr "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Het bestand is gedeeltelijk geüpload"
+msgstr "Het bestand is slechts gedeeltelijk geupload"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Er is geen bestand geüpload"
+msgstr "Geen bestand geüpload"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Er ontbreekt een tijdelijke map"
+msgstr "Een tijdelijke map mist"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +90,21 @@ msgstr "Ongeldige directory."
msgid "Files"
msgstr "Bestanden"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Delen"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Verwijder definitief"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Verwijder"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Hernoem"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "In behandeling"
+msgstr "Wachten"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -164,7 +172,7 @@ msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestand
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
+msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes"
#: js/files.js:272
msgid "Not enough space available"
@@ -197,11 +205,11 @@ msgstr "Naam"
#: js/files.js:873 templates/index.php:81
msgid "Size"
-msgstr "Grootte"
+msgstr "Bestandsgrootte"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "Aangepast"
+msgstr "Laatst aangepast"
#: js/files.js:893
msgid "1 folder"
@@ -221,7 +229,7 @@ msgstr "{count} bestanden"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Uploaden"
+msgstr "Upload"
#: templates/admin.php:5
msgid "File handling"
@@ -253,7 +261,7 @@ msgstr "Maximale grootte voor ZIP bestanden"
#: templates/admin.php:26
msgid "Save"
-msgstr "Bewaren"
+msgstr "Opslaan"
#: templates/index.php:7
msgid "New"
@@ -289,15 +297,15 @@ msgstr "Er bevindt zich hier niets. Upload een bestand!"
#: templates/index.php:76
msgid "Download"
-msgstr "Downloaden"
+msgstr "Download"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Stop met delen"
+msgstr "Stop delen"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Upload is te groot"
+msgstr "Bestanden te groot"
#: templates/index.php:110
msgid ""
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 548a5be15b..76bec86568 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013.
+# Lennart Weijl <lenny@weijl.org>, 2013.
+# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 1373520072..f1fefe88e1 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2012-2013.
+# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,26 +39,19 @@ msgstr "Geef een geldige Dropbox key en secret."
msgid "Error configuring Google Drive storage"
msgstr "Fout tijdens het configureren van Google Drive opslag"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Waarschuwing:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van ownCloud / WebDAV of GoogleDrive is niet mogelijk. Vraag uw systeembeheerder dit te installeren."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Externe opslag"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 75628354dc..e64ffbe44b 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <didi.debian@cknow.org>, 2012.
+# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 944f801c1a..c80e748b44 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 4b1bafb81f..9254c97a29 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013.
+# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index c56862e931..36dc7d9638 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013
+# Len <lenny@weijl.org>, 2012
+# Richard Bos <radoeka@gmail.com>, 2012
+# bartv <transifex@thisnet.nl>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +117,72 @@ msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
msgid "%s set the database host."
msgstr "%s instellen databaseservernaam."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Geef of een bestaand account op of het beheerdersaccount."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fout: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Onjuiste commande was: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Verwijder deze gebruiker uit MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Verwijder deze gebruiker uit MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
@@ -235,6 +239,19 @@ msgstr "vorig jaar"
msgid "years ago"
msgstr "jaar geleden"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s is beschikbaar. Verkrijg <a href=\"%s\">meer informatie</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "bijgewerkt"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "Meest recente versie controle is uitgeschakeld"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 577422c469..34b223ac45 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -3,14 +3,25 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2012-2013.
+# <bart.formosus@gmail.com>, 2011.
+# <bramdv@me.com>, 2012.
+# <didi.debian@cknow.org>, 2012.
+# Erik Bent <hj.bent.60@gmail.com>, 2012.
+# <icewind1991@gmail.com>, 2011, 2012.
+# <jos@gelauff.net>, 2012.
+# <koen@vervloesem.eu>, 2011.
+# <lenny@weijl.org>, 2012.
+# <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@gmail.com>, 2012.
+# Wilfred Dijksman <translate@wdijksman.nl>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +33,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Kan de lijst niet van de App store laden"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Authenticatie fout"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Uw weergavenaam is gewijzigd."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Kon de weergavenaam niet wijzigen"
@@ -69,7 +76,7 @@ msgstr "Taal aangepast"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Ongeldige aanvraag"
+msgstr "Ongeldig verzoek"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -99,7 +106,7 @@ msgstr "Uitschakelen"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Activeer"
+msgstr "Inschakelen"
#: js/apps.js:55
msgid "Please wait...."
@@ -121,9 +128,9 @@ msgstr "Fout bij bijwerken app"
msgid "Updated"
msgstr "Bijgewerkt"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Opslaan"
+msgstr "Aan het bewaren....."
#: js/users.js:43
msgid "deleted"
@@ -137,18 +144,18 @@ msgstr "ongedaan maken"
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "Verwijder"
+msgstr "verwijderen"
#: js/users.js:262
msgid "add group"
@@ -166,7 +173,7 @@ msgstr "Fout bij aanmaken gebruiker"
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Nederlands"
@@ -196,7 +203,7 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
+msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -317,19 +324,19 @@ msgstr "Log"
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Meer"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +407,7 @@ msgstr "Download de apps om bestanden te synchen"
msgid "Show First Run Wizard again"
msgstr "Toon de Eerste start Wizard opnieuw"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Wachtwoord"
@@ -418,76 +425,88 @@ msgstr "Huidig wachtwoord"
#: templates/personal.php:42
msgid "New password"
-msgstr "Nieuw"
+msgstr "Nieuw wachtwoord"
#: templates/personal.php:44
msgid "Change password"
msgstr "Wijzig wachtwoord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Weergavenaam"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Uw weergavenaam is gewijzigd"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Kon de weergavenaam niet wijzigen"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Wijzig weergavenaam"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-mailadres"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Uw e-mailadres"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Taal"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Help met vertalen"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Inlognaam"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Creëer"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Default opslag"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ongelimiteerd"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "Anders"
+msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Opslag"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "wijzig weergavenaam"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "Instellen nieuw wachtwoord"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Default"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e7ea182314..2e4e387628 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2012-2013.
+# <bart.formosus@gmail.com>, 2013.
+# <lenny@weijl.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index c2f9d6ea43..40265bd47a 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
+# <erviker@gmail.com>, 2012.
+# <p.ixiemotion@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -21,65 +22,65 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "User %s shared a file with you"
-msgstr "Brukaren %s delte ei fil med deg"
+msgstr ""
#: ajax/share.php:99
#, php-format
msgid "User %s shared a folder with you"
-msgstr "Brukaren %s delte ei mappe med deg"
+msgstr ""
#: ajax/share.php:101
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr "Brukaren %s delte fila «%s» med deg. Du kan lasta ho ned her: %s"
+msgstr ""
#: ajax/share.php:104
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr "Brukaren %s delte mappa «%s» med deg. Du kan lasta ho ned her: %s"
+msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr "Ingen kategoritype."
+msgstr ""
#: ajax/vcategories/add.php:30
msgid "No category to add?"
-msgstr "Ingen kategori å leggja til?"
+msgstr ""
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr "Denne kategorien finst alt: %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 "Ingen objekttype."
+msgstr ""
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr "Ingen %s-ID."
+msgstr ""
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr "Klarte ikkje å leggja til %s i favorittar."
+msgstr ""
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Ingen kategoriar valt for sletting."
+msgstr ""
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr "Klarte ikkje å fjerna %s frå favorittar."
+msgstr ""
#: js/config.php:34
msgid "Sunday"
@@ -163,80 +164,80 @@ msgstr "Innstillingar"
#: js/js.js:718
msgid "seconds ago"
-msgstr "sekund sidan"
+msgstr ""
#: js/js.js:719
msgid "1 minute ago"
-msgstr "1 minutt sidan"
+msgstr ""
#: js/js.js:720
msgid "{minutes} minutes ago"
-msgstr "{minutes} minutt sidan"
+msgstr ""
#: js/js.js:721
msgid "1 hour ago"
-msgstr "1 time sidan"
+msgstr ""
#: js/js.js:722
msgid "{hours} hours ago"
-msgstr "{hours} timar sidan"
+msgstr ""
#: js/js.js:723
msgid "today"
-msgstr "i dag"
+msgstr ""
#: js/js.js:724
msgid "yesterday"
-msgstr "i går"
+msgstr ""
#: js/js.js:725
msgid "{days} days ago"
-msgstr "{days} dagar sidan"
+msgstr ""
#: js/js.js:726
msgid "last month"
-msgstr "førre månad"
+msgstr ""
#: js/js.js:727
msgid "{months} months ago"
-msgstr "{months) månader sidan"
+msgstr ""
#: js/js.js:728
msgid "months ago"
-msgstr "månader sidan"
+msgstr ""
#: js/js.js:729
msgid "last year"
-msgstr "i fjor"
+msgstr ""
#: js/js.js:730
msgid "years ago"
-msgstr "Ã¥r sidan"
+msgstr ""
#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
msgid "Ok"
-msgstr "Greitt"
+msgstr ""
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Avbryt"
+msgstr "Kanseller"
#: js/oc-dialogs.js:185
msgid "Choose"
-msgstr "Vel"
+msgstr ""
#: js/oc-dialogs.js:215
msgid "Yes"
-msgstr "Ja"
+msgstr ""
#: js/oc-dialogs.js:222
msgid "No"
-msgstr "Nei"
+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 "Objekttypen er ikkje spesifisert."
+msgstr ""
#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
@@ -248,176 +249,173 @@ msgstr "Feil"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr "App-namnet er ikkje spesifisert."
+msgstr ""
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr "Den kravde fila {file} er ikkje installert!"
+msgstr ""
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
-msgstr "Delt"
+msgstr ""
#: js/share.js:90
msgid "Share"
-msgstr "Del"
+msgstr ""
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
-msgstr "Feil ved deling"
+msgstr ""
#: js/share.js:136
msgid "Error while unsharing"
-msgstr "Feil ved udeling"
+msgstr ""
#: js/share.js:143
msgid "Error while changing permissions"
-msgstr "Feil ved endring av tillatingar"
+msgstr ""
#: js/share.js:152
msgid "Shared with you and the group {group} by {owner}"
-msgstr "Delt med deg og gruppa {group} av {owner}"
+msgstr ""
#: js/share.js:154
msgid "Shared with you by {owner}"
-msgstr "Delt med deg av {owner}"
+msgstr ""
#: js/share.js:159
msgid "Share with"
-msgstr "Del med"
+msgstr ""
#: js/share.js:164
msgid "Share with link"
-msgstr "Del med lenkje"
+msgstr ""
#: js/share.js:167
msgid "Password protect"
-msgstr "Passordvern"
+msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Passord"
#: js/share.js:173
msgid "Email link to person"
-msgstr "Send lenkja over e-post"
+msgstr ""
#: js/share.js:174
msgid "Send"
-msgstr "Send"
+msgstr ""
#: js/share.js:178
msgid "Set expiration date"
-msgstr "Set utlaupsdato"
+msgstr ""
#: js/share.js:179
msgid "Expiration date"
-msgstr "Utlaupsdato"
+msgstr ""
#: js/share.js:211
msgid "Share via email:"
-msgstr "Del over e-post:"
+msgstr ""
#: js/share.js:213
msgid "No people found"
-msgstr "Fann ingen personar"
+msgstr ""
#: js/share.js:251
msgid "Resharing is not allowed"
-msgstr "Vidaredeling er ikkje tillate"
+msgstr ""
#: js/share.js:287
msgid "Shared in {item} with {user}"
-msgstr "Delt i {item} med {brukar}"
+msgstr ""
#: js/share.js:308
msgid "Unshare"
-msgstr "Udel"
+msgstr ""
#: js/share.js:320
msgid "can edit"
-msgstr "kan endra"
+msgstr ""
#: js/share.js:322
msgid "access control"
-msgstr "tilgangskontroll"
+msgstr ""
#: js/share.js:325
msgid "create"
-msgstr "lag"
+msgstr ""
#: js/share.js:328
msgid "update"
-msgstr "oppdater"
+msgstr ""
#: js/share.js:331
msgid "delete"
-msgstr "slett"
+msgstr ""
#: js/share.js:334
msgid "share"
-msgstr "del"
+msgstr ""
#: js/share.js:368 js/share.js:564
msgid "Password protected"
-msgstr "Passordverna"
+msgstr ""
#: js/share.js:577
msgid "Error unsetting expiration date"
-msgstr "Klarte ikkje å fjerna utlaupsdato"
+msgstr ""
#: js/share.js:589
msgid "Error setting expiration date"
-msgstr "Klarte ikkje å setja utlaupsdato"
+msgstr ""
#: js/share.js:604
msgid "Sending ..."
-msgstr "Sender …"
+msgstr ""
#: js/share.js:615
msgid "Email sent"
-msgstr "E-post sendt"
+msgstr ""
#: js/update.js:14
msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
+msgstr ""
#: js/update.js:18
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
+msgstr ""
#: lostpassword/controller.php:48
msgid "ownCloud password reset"
-msgstr "Nullstilling av ownCloud-passord"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}"
+msgstr "Bruk føljane link til å tilbakestille passordet ditt: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du vil få ei lenkje for å nullstilla passordet via epost."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Brukarnamn"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Be om nullstilling"
@@ -427,7 +425,7 @@ msgstr "Passordet ditt er nullstilt"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
-msgstr "Til innloggingssida"
+msgstr "Til innloggings sida"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
@@ -451,7 +449,7 @@ msgstr "Applikasjonar"
#: strings.php:8
msgid "Admin"
-msgstr "Admin"
+msgstr "Administrer"
#: strings.php:9
msgid "Help"
@@ -459,7 +457,7 @@ msgstr "Hjelp"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr "Tilgang forbudt"
+msgstr ""
#: templates/404.php:12
msgid "Cloud not found"
@@ -467,7 +465,7 @@ msgstr "Fann ikkje skyen"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Endra kategoriar"
+msgstr ""
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -476,40 +474,40 @@ msgstr "Legg til"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
msgid "Security Warning"
-msgstr "Tryggleiksåtvaring"
+msgstr ""
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)"
+msgstr ""
#: templates/installation.php:26
msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte."
+msgstr ""
#: templates/installation.php:32
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP."
+msgstr ""
#: templates/installation.php:33
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din."
+msgstr ""
#: templates/installation.php:39
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer."
+msgstr ""
#: templates/installation.php:40
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
"target=\"_blank\">documentation</a>."
-msgstr "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for å læra korleis du set opp tenaren din på rett måte."
+msgstr ""
#: templates/installation.php:44
msgid "Create an <strong>admin account</strong>"
@@ -523,82 +521,77 @@ msgstr "Avansert"
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "vil bli nytta"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Databasebrukar"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Databasepassord"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Databasenamn"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
-msgstr "Tabellnamnrom for database"
+msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Databasetenar"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Fullfør oppsettet"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "Vevtenester under din kontroll"
+msgstr "Vev tjenester under din kontroll"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Logg ut"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
-msgstr "Automatisk innlogging avvist!"
+msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompromittert!"
+msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
-msgstr "Ver venleg og endra passordet for å gjera kontoen din trygg igjen."
+msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Gløymt passordet?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "hugs"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Logg inn"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
-msgstr "Alternative innloggingar"
+msgstr ""
#: templates/part.pagenavi.php:3
msgid "prev"
@@ -611,4 +604,4 @@ msgstr "neste"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
+msgstr ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 388d90f63a..ff7697f86e 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
+# <erviker@gmail.com>, 2012.
+# <p.ixiemotion@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:50+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,20 +22,20 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet"
+msgstr ""
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr "Klarte ikkje å flytta %s"
+msgstr ""
#: ajax/rename.php:22 ajax/rename.php:25
msgid "Unable to rename file"
-msgstr "Klarte ikkje å endra filnamnet"
+msgstr ""
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr "Ingen filer lasta opp. Ukjend feil"
+msgstr ""
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
@@ -43,7 +44,7 @@ msgstr "Ingen feil, fila vart lasta opp"
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: "
+msgstr ""
#: ajax/upload.php:29
msgid ""
@@ -65,160 +66,156 @@ msgstr "Manglar ei mellombels mappe"
#: ajax/upload.php:33
msgid "Failed to write to disk"
-msgstr "Klarte ikkje å skriva til disk"
+msgstr ""
#: ajax/upload.php:51
msgid "Not enough storage available"
-msgstr "Ikkje nok lagringsplass tilgjengeleg"
+msgstr ""
#: ajax/upload.php:83
msgid "Invalid directory."
-msgstr "Ugyldig mappe."
+msgstr ""
#: appinfo/app.php:12
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Del"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
-msgstr "Slett for godt"
+msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Slett"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
-msgstr "Endra namn"
+msgstr ""
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "Under vegs"
+msgstr ""
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
-msgstr "{new_name} finst allereie"
+msgstr ""
#: js/filelist.js:252 js/filelist.js:254
msgid "replace"
-msgstr "byt ut"
+msgstr ""
#: js/filelist.js:252
msgid "suggest name"
-msgstr "føreslå namn"
+msgstr ""
#: js/filelist.js:252 js/filelist.js:254
msgid "cancel"
-msgstr "avbryt"
+msgstr ""
#: js/filelist.js:299
msgid "replaced {new_name} with {old_name}"
-msgstr "bytte ut {new_name} med {old_name}"
+msgstr ""
#: js/filelist.js:299
msgid "undo"
-msgstr "angre"
+msgstr ""
#: js/filelist.js:324
msgid "perform delete operation"
-msgstr "utfør sletting"
+msgstr ""
#: js/filelist.js:406
msgid "1 file uploading"
-msgstr "1 fil lastar opp"
+msgstr ""
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "filer lastar opp"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
-msgstr "«.» er eit ugyldig filnamn."
+msgstr ""
#: js/files.js:56
msgid "File name cannot be empty."
-msgstr "Filnamnet kan ikkje vera tomt."
+msgstr ""
#: js/files.js:64
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
+msgstr ""
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
+msgstr ""
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
+msgstr ""
-#: js/files.js:231
+#: js/files.js:226
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
+msgstr ""
-#: js/files.js:264
+#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte"
+msgstr ""
-#: js/files.js:277
+#: js/files.js:272
msgid "Not enough space available"
-msgstr "Ikkje nok lagringsplass tilgjengeleg"
+msgstr ""
-#: js/files.js:317
+#: js/files.js:312
msgid "Upload cancelled."
-msgstr "Opplasting avbroten."
+msgstr ""
-#: js/files.js:413
+#: js/files.js:408
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten."
+msgstr ""
-#: js/files.js:486
+#: js/files.js:481
msgid "URL cannot be empty."
-msgstr "URL-en kan ikkje vera tom."
+msgstr ""
-#: js/files.js:491
+#: js/files.js:486
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
+msgstr ""
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
msgid "Error"
msgstr "Feil"
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:872 templates/index.php:70
msgid "Name"
msgstr "Namn"
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:873 templates/index.php:81
msgid "Size"
msgstr "Storleik"
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:874 templates/index.php:83
msgid "Modified"
msgstr "Endra"
-#: js/files.js:898
+#: js/files.js:893
msgid "1 folder"
-msgstr "1 mappe"
+msgstr ""
-#: js/files.js:900
+#: js/files.js:895
msgid "{count} folders"
-msgstr "{count} mapper"
+msgstr ""
-#: js/files.js:908
+#: js/files.js:903
msgid "1 file"
-msgstr "1 fil"
+msgstr ""
-#: js/files.js:910
+#: js/files.js:905
msgid "{count} files"
-msgstr "{count} filer"
+msgstr ""
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -226,7 +223,7 @@ msgstr "Last opp"
#: templates/admin.php:5
msgid "File handling"
-msgstr "Filhandtering"
+msgstr ""
#: templates/admin.php:7
msgid "Maximum upload size"
@@ -234,23 +231,23 @@ msgstr "Maksimal opplastingsstorleik"
#: templates/admin.php:10
msgid "max. possible: "
-msgstr "maks. moglege:"
+msgstr ""
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Naudsynt for fleirfils- og mappenedlastingar."
+msgstr ""
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Skru på ZIP-nedlasting"
+msgstr ""
#: templates/admin.php:20
msgid "0 is unlimited"
-msgstr "0 er ubegrensa"
+msgstr ""
#: templates/admin.php:22
msgid "Maximum input size for ZIP files"
-msgstr "Maksimal storleik for ZIP-filer"
+msgstr ""
#: templates/admin.php:26
msgid "Save"
@@ -270,50 +267,50 @@ msgstr "Mappe"
#: templates/index.php:14
msgid "From link"
-msgstr "Frå lenkje"
+msgstr ""
#: templates/index.php:42
msgid "Deleted files"
-msgstr "Sletta filer"
+msgstr ""
#: templates/index.php:48
msgid "Cancel upload"
-msgstr "Avbryt opplasting"
+msgstr ""
-#: templates/index.php:54
+#: templates/index.php:55
msgid "You don’t have write permissions here."
-msgstr "Du har ikkje skriverettar her."
+msgstr ""
-#: templates/index.php:61
+#: templates/index.php:62
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last noko opp!"
-#: templates/index.php:75
+#: templates/index.php:76
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Udel"
+msgstr ""
-#: templates/index.php:107
+#: templates/index.php:108
msgid "Upload too large"
msgstr "For stor opplasting"
-#: templates/index.php:109
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
-#: templates/index.php:114
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
-msgstr "Skannar filer, ver venleg og vent."
+msgstr ""
-#: templates/index.php:117
+#: templates/index.php:118
msgid "Current scanning"
-msgstr "Køyrande skanning"
+msgstr ""
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "Oppgraderer mellomlageret av filsystemet …"
+msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 8e3b4ed5f7..ef0923d2a4 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 444e7be0a1..88b567ae90 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 94d12c1829..296e7f5ae1 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 17:40+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Passord"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Send"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Last ned"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "Vev tjenester under din kontroll"
+msgstr ""
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 14a63b1462..1924d58a15 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-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 14:40+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr ""
#: js/trash.js:121
msgid "Delete permanently"
-msgstr "Slett for godt"
+msgstr ""
#: js/trash.js:174 templates/index.php:17
msgid "Name"
@@ -53,19 +53,19 @@ msgstr ""
#: js/trash.js:184
msgid "1 folder"
-msgstr "1 mappe"
+msgstr ""
#: js/trash.js:186
msgid "{count} folders"
-msgstr "{count} mapper"
+msgstr ""
#: js/trash.js:194
msgid "1 file"
-msgstr "1 fil"
+msgstr ""
#: js/trash.js:196
msgid "{count} files"
-msgstr "{count} filer"
+msgstr ""
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 0a5ad71179..3ab98c3053 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 9521606544..5e13b5d53a 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.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-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "Brukarar"
#: app.php:398
msgid "Apps"
-msgstr "Applikasjonar"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,83 +113,83 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
+msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
+msgstr ""
#: template.php:113
msgid "seconds ago"
-msgstr "sekund sidan"
+msgstr ""
#: template.php:114
msgid "1 minute ago"
-msgstr "1 minutt sidan"
+msgstr ""
#: template.php:115
#, php-format
@@ -198,7 +198,7 @@ msgstr ""
#: template.php:116
msgid "1 hour ago"
-msgstr "1 time sidan"
+msgstr ""
#: template.php:117
#, php-format
@@ -207,11 +207,11 @@ msgstr ""
#: template.php:118
msgid "today"
-msgstr "i dag"
+msgstr ""
#: template.php:119
msgid "yesterday"
-msgstr "i går"
+msgstr ""
#: template.php:120
#, php-format
@@ -220,7 +220,7 @@ msgstr ""
#: template.php:121
msgid "last month"
-msgstr "førre månad"
+msgstr ""
#: template.php:122
#, php-format
@@ -229,11 +229,24 @@ msgstr ""
#: template.php:123
msgid "last year"
-msgstr "i fjor"
+msgstr ""
#: template.php:124
msgid "years ago"
-msgstr "Ã¥r sidan"
+msgstr ""
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index ac35cb7aed..a273c96f06 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# unhammer <unhammer+dill@mm.st>, 2013
+# <erviker@gmail.com>, 2012.
+# <p.ixiemotion@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,32 +21,28 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr "Klarer ikkje å lasta inn liste fra app-butikken"
+msgstr "Klarer ikkje å laste inn liste fra App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Autentiseringsfeil"
+msgstr "Feil i autentisering"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Visningsnamnet ditt er endra."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
-msgstr "Klarte ikkje å endra visningsnamnet"
+msgstr ""
#: ajax/creategroup.php:10
msgid "Group already exists"
-msgstr "Gruppa finst allereie"
+msgstr ""
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr "Klarte ikkje å leggja til gruppa"
+msgstr ""
#: ajax/enableapp.php:11
msgid "Could not enable app. "
-msgstr "Klarte ikkje å aktivera app-en."
+msgstr ""
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -57,11 +54,11 @@ msgstr "Ugyldig e-postadresse"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
-msgstr "Klarte ikkje å sletta gruppa"
+msgstr ""
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr "Klarte ikkje å sletta brukaren"
+msgstr ""
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -73,25 +70,25 @@ msgstr "Ugyldig førespurnad"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa"
+msgstr ""
#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
-msgstr "Klarte ikkje å leggja til brukaren til gruppa %s"
+msgstr ""
#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
-msgstr "Klarte ikkje å fjerna brukaren frå gruppa %s"
+msgstr ""
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr "Klarte ikkje å oppdatera app-en."
+msgstr ""
#: js/apps.js:30
msgid "Update to {appversion}"
-msgstr "Oppdater til {appversion}"
+msgstr ""
#: js/apps.js:36 js/apps.js:76
msgid "Disable"
@@ -103,7 +100,7 @@ msgstr "Slå på"
#: js/apps.js:55
msgid "Please wait...."
-msgstr "Ver venleg og vent …"
+msgstr ""
#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
msgid "Error"
@@ -111,68 +108,68 @@ msgstr "Feil"
#: js/apps.js:90
msgid "Updating...."
-msgstr "Oppdaterer …"
+msgstr ""
#: js/apps.js:93
msgid "Error while updating app"
-msgstr "Feil ved oppdatering av app"
+msgstr ""
#: js/apps.js:96
msgid "Updated"
-msgstr "Oppdatert"
+msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Lagrar …"
+msgstr ""
#: js/users.js:43
msgid "deleted"
-msgstr "sletta"
+msgstr ""
#: js/users.js:43
msgid "undo"
-msgstr "angra"
+msgstr ""
#: js/users.js:75
msgid "Unable to remove user"
-msgstr "Klarte ikkje å fjerna brukaren"
+msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
-msgstr "Gruppestyrar"
+msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Slett"
#: js/users.js:262
msgid "add group"
-msgstr "legg til gruppe"
+msgstr ""
#: js/users.js:414
msgid "A valid username must be provided"
-msgstr "Du må oppgje eit gyldig brukarnamn"
+msgstr ""
#: js/users.js:415 js/users.js:421 js/users.js:436
msgid "Error creating user"
-msgstr "Feil ved oppretting av brukar"
+msgstr ""
#: js/users.js:420
msgid "A valid password must be provided"
-msgstr "Du må oppgje eit gyldig passord"
+msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Nynorsk"
#: templates/admin.php:15
msgid "Security Warning"
-msgstr "Tryggleiksåtvaring"
+msgstr ""
#: templates/admin.php:18
msgid ""
@@ -181,36 +178,36 @@ 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 "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rår sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frå dokumentrota til tenaren."
+msgstr ""
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr "Oppsettsåtvaring"
+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 "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
+msgstr ""
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
+msgstr ""
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr "Modulen «fileinfo» manglar"
+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 "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar."
+msgstr ""
#: templates/admin.php:58
msgid "Locale not working"
-msgstr "Regionaldata fungerer ikkje"
+msgstr ""
#: templates/admin.php:63
#, php-format
@@ -218,11 +215,11 @@ msgid ""
"This ownCloud server can't set system locale to %s. This means that there "
"might be problems with certain characters in file names. We strongly suggest"
" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s."
+msgstr ""
#: templates/admin.php:75
msgid "Internet connection not working"
-msgstr "Nettilkoplinga fungerer ikkje"
+msgstr ""
#: templates/admin.php:78
msgid ""
@@ -232,104 +229,104 @@ 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 "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
+msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "Utfør éi oppgåve for kvar sidelasting"
+msgstr ""
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http."
+msgstr ""
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet."
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Deling"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Skru på API-et for deling"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "La app-ar bruka API-et til deling"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "Tillat lenkjer"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "La brukarar dela ting offentleg med lenkjer"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "Tillat vidaredeling"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "La brukarar vidaredela delte ting"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "La brukarar dela med kven som helst"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "La brukarar dela berre med brukarar i deira grupper"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
-msgstr "Tryggleik"
+msgstr ""
#: templates/admin.php:181
msgid "Enforce HTTPS"
-msgstr "Krev HTTPS"
+msgstr ""
#: templates/admin.php:182
msgid ""
"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
+msgstr ""
#: templates/admin.php:185
msgid ""
"Please connect to this ownCloud instance via HTTPS to enable or disable the "
"SSL enforcement."
-msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga."
+msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Logg"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Log nivå"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr "Meir"
+msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
-msgstr "Mindre"
+msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
-msgstr "Utgåve"
+msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -337,15 +334,15 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr ""
#: templates/apps.php:11
msgid "Add your App"
-msgstr "Legg til din app"
+msgstr ""
#: templates/apps.php:12
msgid "More Apps"
-msgstr "Fleire app-ar"
+msgstr ""
#: templates/apps.php:28
msgid "Select an App"
@@ -353,11 +350,11 @@ msgstr "Vel ein applikasjon"
#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
-msgstr "Sjå applikasjonssida på apps.owncloud.com"
+msgstr ""
#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>"
+msgstr ""
#: templates/apps.php:38
msgid "Update"
@@ -365,48 +362,48 @@ msgstr "Oppdater"
#: templates/help.php:4
msgid "User Documentation"
-msgstr "Brukardokumentasjon"
+msgstr ""
#: templates/help.php:6
msgid "Administrator Documentation"
-msgstr "Administratordokumentasjon"
+msgstr ""
#: templates/help.php:9
msgid "Online Documentation"
-msgstr "Dokumentasjon på nett"
+msgstr ""
#: templates/help.php:11
msgid "Forum"
-msgstr "Forum"
+msgstr ""
#: templates/help.php:14
msgid "Bugtracker"
-msgstr "Feilsporar"
+msgstr ""
#: templates/help.php:17
msgid "Commercial Support"
-msgstr "Betalt brukarstøtte"
+msgstr ""
#: templates/personal.php:8
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
+msgstr ""
#: templates/personal.php:15
msgid "Get the apps to sync your files"
-msgstr "FÃ¥ app-ar som kan synkronisera filene dine"
+msgstr ""
#: templates/personal.php:26
msgid "Show First Run Wizard again"
-msgstr "Vis Oppstartvegvisaren igjen"
+msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Passord"
#: templates/personal.php:38
msgid "Your password was changed"
-msgstr "Passordet ditt er endra"
+msgstr ""
#: templates/personal.php:39
msgid "Unable to change your password"
@@ -424,70 +421,82 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endra passord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
-msgstr "Visningsnamn"
+msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "E-post"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "Epost"
+
+#: templates/personal.php:72
msgid "Your email address"
-msgstr "Di epost-adresse"
+msgstr "Din epost addresse"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn e-postadressa di for å aktivera passordgjenoppretting"
+msgstr "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
-msgstr "Hjelp oss å omsetja"
+msgstr "Hjelp oss å oversett"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
-msgstr "WebDAV"
+msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din"
+msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
-msgstr "Innloggingsnamn"
+msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Lag"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
-msgstr "Standardlagring"
+msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
-msgstr "Ubegrensa"
+msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Anna"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
-msgstr "Lagring"
+msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
-msgstr "endra visningsnamn"
+msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
-msgstr "lag nytt passord"
+msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
-msgstr "Standard"
+msgstr ""
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index d8e1814636..f15d6449f3 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "Passord"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 7e55cfc676..9414d1bcf4 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <d.chateau@laposte.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -110,43 +111,43 @@ msgstr "Dissabte"
#: js/config.php:45
msgid "January"
-msgstr "genièr"
+msgstr "Genièr"
#: js/config.php:46
msgid "February"
-msgstr "febrièr"
+msgstr "Febrièr"
#: js/config.php:47
msgid "March"
-msgstr "març"
+msgstr "Març"
#: js/config.php:48
msgid "April"
-msgstr "abril"
+msgstr "Abril"
#: js/config.php:49
msgid "May"
-msgstr "mai"
+msgstr "Mai"
#: js/config.php:50
msgid "June"
-msgstr "junh"
+msgstr "Junh"
#: js/config.php:51
msgid "July"
-msgstr "julhet"
+msgstr "Julhet"
#: js/config.php:52
msgid "August"
-msgstr "agost"
+msgstr "Agost"
#: js/config.php:53
msgid "September"
-msgstr "septembre"
+msgstr "Septembre"
#: js/config.php:54
msgid "October"
-msgstr "octobre"
+msgstr "Octobre"
#: js/config.php:55
msgid "November"
@@ -218,7 +219,7 @@ msgstr "D'accòrdi"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Annula"
+msgstr "Anulla"
#: js/oc-dialogs.js:185
msgid "Choose"
@@ -293,7 +294,7 @@ msgstr "Parteja amb lo ligam"
msgid "Password protect"
msgstr "Parat per senhal"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Senhal"
@@ -331,7 +332,7 @@ msgstr ""
#: js/share.js:308
msgid "Unshare"
-msgstr "Pas partejador"
+msgstr "Non parteje"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +397,24 @@ msgstr "senhal d'ownCloud tornat botar"
msgid "Use the following link to reset your password: {link}"
msgstr "Utiliza lo ligam seguent per tornar botar lo senhal : {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Non d'usancièr"
+msgstr "Nom d'usancièr"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Tornar botar requesit"
@@ -430,7 +428,7 @@ msgstr "Pagina cap al login"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "Senhal novèl"
+msgstr "Senhal nòu"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -522,37 +520,37 @@ msgstr "Avançat"
msgid "Data folder"
msgstr "Dorsièr de donadas"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configura la basa de donadas"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "serà utilizat"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Usancièr de la basa de donadas"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Senhal de la basa de donadas"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nom de la basa de donadas"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Espandi de taula de basa de donadas"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Ã’ste de basa de donadas"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Configuracion acabada"
@@ -560,42 +558,37 @@ msgstr "Configuracion acabada"
msgid "web services under your control"
msgstr "Services web jos ton contraròtle"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Sortida"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "L'as perdut lo senhal ?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "bremba-te"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Dintrada"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 7bff1f0e1b..1a86e26f56 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <d.chateau@laposte.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr ""
msgid "Files"
msgstr "Fichièrs"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Parteja"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Escafa"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Torna nomenar"
@@ -132,7 +129,7 @@ msgstr "1 fichièr al amontcargar"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "fichièrs al amontcargar"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -293,7 +290,7 @@ msgstr "Avalcarga"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Pas partejador"
+msgstr "Non parteja"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 3fbf4c0e83..a7fbf59235 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index d4da7a4ee8..ea558c0a4f 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 9f1de7e3bd..f250912c1e 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Senhal"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Sosmetre"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Avalcarga"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "Services web jos ton contraròtle"
+msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 70bce2472e..a631653516 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index 0c94025552..eea377d183 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 68de313804..df4835c6ea 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# tartafione <d.chateau@laposte.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +236,19 @@ msgstr "an passat"
msgid "years ago"
msgstr "ans a"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:81
+msgid "up to date"
+msgstr "a jorn"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "la verificacion de mesa a jorn es inactiva"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 69c7ff6ab7..df9e092959 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <d.chateau@laposte.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Pas possible de cargar la tièra dempuèi App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Error d'autentificacion"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Enregistra..."
@@ -136,16 +133,16 @@ msgstr "defar"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grops"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grop Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Escafa"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -235,11 +232,11 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "Executa un prètfach amb cada pagina cargada"
+msgstr ""
#: templates/admin.php:111
msgid ""
@@ -251,15 +248,15 @@ msgstr ""
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta."
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Al partejar"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Activa API partejada"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
@@ -310,25 +307,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Jornal"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr "Mai d'aquò"
+msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Senhal"
@@ -423,70 +420,82 @@ msgstr "Senhal novèl"
msgid "Change password"
msgstr "Cambia lo senhal"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Corrièl"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Ton adreiça de corrièl"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Emplena una adreiça de corrièl per permetre lo mandadÃs del senhal perdut"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Lenga"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ajuda a la revirada"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Autres"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 4da5e8266b..00048980bf 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "Senhal"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index ea1cd8ebbc..91dcac0d46 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,12 +3,25 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
+# Kamil Domański <kdomanski@kdemail.net>, 2011.
+# <koalamis0@gmail.com>, 2012.
+# Maciej Tarmas <maciej@tarmas.com>, 2013.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
+# Marcin Małecki <mosslar@gmail.com>, 2011.
+# Marco Oliver Grunwald <marco@mgrvnwald.com>, 2013.
+# Michał Plichta <mplichta@gmail.com>, 2013.
+# <mosslar@gmail.com>, 2011.
+# <mplichta@gmail.com>, 2012.
+# Piotr Sokół <psokol@jabster.pl>, 2012.
+# <rightxhere1@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +306,7 @@ msgstr "Współdziel wraz z odnośnikiem"
msgid "Password protect"
msgstr "Zabezpiecz hasłem"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Hasło"
@@ -396,27 +409,24 @@ msgstr "restart hasła ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Użyj tego odnośnika by zresetować hasło: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Wysłano e-mail resetujący."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Żądanie nieudane!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nazwa użytkownika"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Żądanie resetowania"
@@ -522,80 +532,75 @@ msgstr "Zaawansowane"
msgid "Data folder"
msgstr "Katalog danych"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Skonfiguruj bazÄ™ danych"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "zostanie użyte"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Użytkownik bazy danych"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Hasło do bazy danych"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nazwa bazy danych"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Obszar tabel bazy danych"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Komputer bazy danych"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Zakończ konfigurowanie"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "Kontrolowane serwisy"
+msgstr "usługi internetowe pod kontrolą"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Wyloguj"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatyczne logowanie odrzucone!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Nie pamiętasz hasła?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "pamiętaj"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Zaloguj"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternatywne loginy"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index bd3470063b..3361b9741f 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,12 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bbartlomiej@gmail.com>, 2013.
+# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
+# Maciej Tarmas <maciej@tarmas.com>, 2013.
+# Marcin Małecki <gerber@tkdami.net>, 2011-2012.
+# Mariusz <fisiu@opensuse.org>, 2013.
+# <mosslar@gmail.com>, 2011.
+# <mplichta@gmail.com>, 2012.
+# Piotr Sokół <psokol@jabster.pl>, 2012.
+# <tomekde@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +47,7 @@ msgstr "Żaden plik nie został załadowany. Nieznany błąd"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Nie było błędów, plik wysłano poprawnie."
+msgstr "Przesłano plik"
#: ajax/upload.php:27
msgid ""
@@ -56,11 +66,11 @@ msgstr "Załadowany plik został wysłany tylko częściowo."
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nie wysłano żadnego pliku"
+msgstr "Nie przesłano żadnego pliku"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Brak folderu tymczasowego"
+msgstr "Brak katalogu tymczasowego"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +88,15 @@ msgstr "Zła ścieżka."
msgid "Files"
msgstr "Pliki"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Udostępnij"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Usuń"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Zmień nazwę"
@@ -221,7 +227,7 @@ msgstr "Ilość plików: {count}"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Wyślij"
+msgstr "Prześlij"
#: templates/admin.php:5
msgid "File handling"
@@ -265,7 +271,7 @@ msgstr "Plik tekstowy"
#: templates/index.php:12
msgid "Folder"
-msgstr "Folder"
+msgstr "Katalog"
#: templates/index.php:14
msgid "From link"
@@ -293,11 +299,11 @@ msgstr "Pobierz"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Zatrzymaj współdzielenie"
+msgstr "Nie udostępniaj"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Åadowany plik jest za duży"
+msgstr "Wysyłany plik ma za duży rozmiar"
#: templates/index.php:110
msgid ""
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 7fd0d19e5c..c2357401d8 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
+# Cyryl Sochacki <>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "Wyłącz poniższe typy plików z szyfrowania:"
#: templates/settings.php:12
msgid "None"
-msgstr "Nic"
+msgstr "Brak"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index d363de4780..7b747f0ed5 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
+# Maciej Tarmas <maciej@tarmas.com>, 2013.
+# Marcin Małecki <gerber@tkdami.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +41,19 @@ msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
msgid "Error configuring Google Drive storage"
msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone. Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Zewnętrzna zasoby dyskowe"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index e97f578322..4007f347ff 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <>, 2012.
+# <mplichta@gmail.com>, 2012.
+# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 48d0debe7f..284ff04071 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -57,7 +58,7 @@ msgstr "1 folder"
#: js/trash.js:186
msgid "{count} folders"
-msgstr "Ilość folderów: {count}"
+msgstr "{count} foldery"
#: js/trash.js:194
msgid "1 file"
@@ -65,7 +66,7 @@ msgstr "1 plik"
#: js/trash.js:196
msgid "{count} files"
-msgstr "Ilość plików: {count}"
+msgstr "{count} pliki"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index f06438de5b..28ab5a893c 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
+# Cyryl Sochacki <>, 2012.
+# Maciej Tarmas <maciej@tarmas.com>, 2013.
+# <mplichta@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index db80af0529..dbc02c98d2 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013
+# Maciej Tarmas <maciej@tarmas.pl>, 2013
+# Marcin Małecki <gerber@tkdami.net>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -113,75 +117,75 @@ msgstr "%s nie można używać kropki w nazwie bazy danych"
msgid "%s set the database host."
msgstr "%s ustaw hosta bazy danych."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Należy wprowadzić istniejące konto użytkownika lub administratora."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "BÅ‚Ä…d DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Niepoprawna komenda: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Użytkownik MySQL '%s'@'localhost' już istnieje"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Usuń tego użytkownika z MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Użytkownik MySQL '%s'@'%%t' już istnieje"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Usuń tego użytkownika z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s."
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
+msgstr "Serwer www nie jest jeszcze poprawnie ustawiony, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony. Sprawdź ustawienia serwera."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
+msgstr "Proszę sprawdź ponownie <a href='%s'>przewodnik instalacji</a>."
#: template.php:113
msgid "seconds ago"
@@ -198,7 +202,7 @@ msgstr "%d minut temu"
#: template.php:116
msgid "1 hour ago"
-msgstr "1 godzinÄ™ temu"
+msgstr "1 godzine temu"
#: template.php:117
#, php-format
@@ -207,7 +211,7 @@ msgstr "%d godzin temu"
#: template.php:118
msgid "today"
-msgstr "dziÅ›"
+msgstr "dzisiaj"
#: template.php:119
msgid "yesterday"
@@ -220,7 +224,7 @@ msgstr "%d dni temu"
#: template.php:121
msgid "last month"
-msgstr "w zeszłym miesiącu"
+msgstr "ostatni miesiÄ…c"
#: template.php:122
#, php-format
@@ -229,12 +233,25 @@ msgstr "%d miesiecy temu"
#: template.php:123
msgid "last year"
-msgstr "w zeszłym roku"
+msgstr "ostatni rok"
#: template.php:124
msgid "years ago"
msgstr "lat temu"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s jest dostępna. Uzyskaj <a href=\"%s\">więcej informacji</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "Aktualne"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "wybór aktualizacji jest wyłączony"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 111fad7ad0..ff5ed02f9b 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,12 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <b13n1u@gmail.com>, 2013.
+# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
+# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
+# <icewind1991@gmail.com>, 2012.
+# Kamil Domański <kdomanski@kdemail.net>, 2011.
+# Maciej Tarmas <maciej@tarmas.com>, 2013.
+# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
+# Marcin Małecki <mosslar@gmail.com>, 2011.
+# Michał Plichta <mplichta@gmail.com>, 2013.
+# <mosslar@gmail.com>, 2011.
+# <mplichta@gmail.com>, 2012.
+# Piotr Sokół <psokol@jabster.pl>, 2012.
+# <tomekde@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +35,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nie można wczytać listy aplikacji"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "BÅ‚Ä…d uwierzytelniania"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Nie można zmienić wyświetlanej nazwy"
@@ -120,7 +130,7 @@ msgstr "BÅ‚Ä…d podczas aktualizacji aplikacji"
msgid "Updated"
msgstr "Zaktualizowano"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Zapisywanie..."
@@ -136,16 +146,16 @@ msgstr "cofnij"
msgid "Unable to remove user"
msgstr "Nie można usunąć użytkownika"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupy"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Usuń"
@@ -165,7 +175,7 @@ msgstr "Błąd podczas tworzenia użytkownika"
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "polski"
@@ -316,19 +326,19 @@ msgstr "Logi"
msgid "Log level"
msgstr "Poziom logów"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Więcej"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -360,7 +370,7 @@ msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"autho
#: templates/apps.php:38
msgid "Update"
-msgstr "Aktualizuj"
+msgstr "Zaktualizuj"
#: templates/help.php:4
msgid "User Documentation"
@@ -399,7 +409,7 @@ msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
msgid "Show First Run Wizard again"
msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Hasło"
@@ -423,70 +433,82 @@ msgstr "Nowe hasło"
msgid "Change password"
msgstr "Zmień hasło"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Wyświetlana nazwa"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Twoja nazwa wyświetlana została zmieniona"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Nie można zmienić twojej wyświetlanej nazwy"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Zmień wyświetlaną nazwę"
#: templates/personal.php:70
+msgid "Email"
+msgstr "E-mail"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Twój adres e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Język"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Pomóż w tłumaczeniu"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Login"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Utwórz"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Magazyn domyślny"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Bez limitu"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Inne"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Magazyn"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "zmień wyświetlaną nazwę"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "ustaw nowe hasło"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index c1425a6570..48697cda32 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013.
+# Maciej Tarmas <maciej@tarmas.com>, 2013.
+# Marcin Małecki <gerber@tkdami.net>, 2012.
+# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -39,7 +44,7 @@ msgstr "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownC
#: js/settings.js:66
msgid "Deletion failed"
-msgstr "Usunięcie nie powiodło się"
+msgstr "Skasowanie nie powiodło się"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 39727ca3ba..59dba27877 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Nazwa użytkownika"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 4cf5e0b547..6c5cbd655c 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index d30c8af652..b041eeee30 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 6624c31b20..038b200e8e 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 663c38c70f..69739f01cb 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -3,13 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# <dudanogueira@gmail.com>, 2012.
+# <duda.nogueira@metasys.com.br>, 2011.
+# <fred.maranhao@gmail.com>, 2012.
+# <glauber.guimaraes@poli.ufrj.br>, 2012.
+# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+# <henrique@meira.net>, 2012.
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
+# Sedir G. Morais <philippi.sedir@gmail.com>, 2013.
+# Thiago Vicente <thiagovice@gmail.com>, 2012.
+# Unforgiving Fallout <>, 2012.
+# Van Der Fran <transifex@vanderland.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -74,7 +85,7 @@ msgstr "Erro ao adicionar %s aos favoritos."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria selecionada para remoção."
+msgstr "Nenhuma categoria selecionada para excluir."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -159,7 +170,7 @@ msgstr "dezembro"
#: js/js.js:286
msgid "Settings"
-msgstr "Ajustes"
+msgstr "Configurações"
#: js/js.js:718
msgid "seconds ago"
@@ -294,7 +305,7 @@ msgstr "Compartilhar com link"
msgid "Password protect"
msgstr "Proteger com senha"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Senha"
@@ -397,27 +408,24 @@ msgstr "Redefinir senha ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Use o seguinte link para redefinir sua senha: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um perÃodo razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Você receberá um link para redefinir sua senha por e-mail."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Email de redefinição de senha enviado."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "A requisição falhou!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Nome de usuário"
+msgstr "Nome de Usuário"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Pedir redefinição"
@@ -447,7 +455,7 @@ msgstr "Usuários"
#: strings.php:7
msgid "Apps"
-msgstr "Aplicações"
+msgstr "Apps"
#: strings.php:8
msgid "Admin"
@@ -523,37 +531,37 @@ msgstr "Avançado"
msgid "Data folder"
msgstr "Pasta de dados"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configurar o banco de dados"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "será usado"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Usuário do banco de dados"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Senha do banco de dados"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nome do banco de dados"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Espaço de tabela do banco de dados"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Host do banco de dados"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Concluir configuração"
@@ -561,42 +569,37 @@ msgstr "Concluir configuração"
msgid "web services under your control"
msgstr "serviços web sob seu controle"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Sair"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Entrada Automática no Sistema Rejeitada!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Por favor troque sua senha para tornar sua conta segura novamente."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Esqueceu sua senha?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Fazer login"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Logins alternativos"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 2e9f259cd2..1347204dd4 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,12 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dudanogueira@gmail.com>, 2013.
+# <dudanogueira@gmail.com>, 2012.
+# <fred.maranhao@gmail.com>, 2012.
+# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
+# Sedir G. Morais <philippi.sedir@gmail.com>, 2013.
+# <targinosilveira@gmail.com>, 2012.
+# Thiago Vicente <thiagovice@gmail.com>, 2012.
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013.
+# Unforgiving Fallout <>, 2012.
+# Van Der Fran <transifex@vanderland.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +49,7 @@ msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Sem erros, o arquivo foi enviado com sucesso"
+msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
#: ajax/upload.php:27
msgid ""
@@ -48,15 +60,15 @@ msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
+msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "O arquivo foi parcialmente enviado"
+msgstr "O arquivo foi transferido parcialmente"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nenhum arquivo enviado"
+msgstr "Nenhum arquivo foi transferido"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +90,15 @@ msgstr "Diretório inválido."
msgid "Files"
msgstr "Arquivos"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Compartilhar"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Excluir"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Renomear"
@@ -221,7 +229,7 @@ msgstr "{count} arquivos"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Upload"
+msgstr "Carregar"
#: templates/admin.php:5
msgid "File handling"
@@ -253,7 +261,7 @@ msgstr "Tamanho máximo para arquivo ZIP"
#: templates/admin.php:26
msgid "Save"
-msgstr "Guardar"
+msgstr "Salvar"
#: templates/index.php:7
msgid "New"
@@ -297,7 +305,7 @@ msgstr "Descompartilhar"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Upload muito grande"
+msgstr "Arquivo muito grande"
#: templates/index.php:110
msgid ""
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 76932c4a27..66f9c4e029 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "Excluir os seguintes tipos de arquivo da criptografia:"
#: templates/settings.php:12
msgid "None"
-msgstr "Nada"
+msgstr "Nenhuma"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 2ff8ade49d..9b0ff93c3c 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# <dudanogueira@gmail.com>, 2013.
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 12:00+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,26 +40,19 @@ msgstr "Por favor forneça um app key e secret válido do Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Erro ao configurar armazenamento do Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> \"smbclient\" não está instalado. ImpossÃvel montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. ImpossÃvel montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b> Aviso: </b> O suport a Curl em PHP não está habilitado ou instalado. A montagem do ownCloud / WebDAV ou GoogleDrive não é possÃvel. Por favor, solicite ao seu administrador do sistema instalá-lo."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Armazenamento Externo"
@@ -105,7 +100,7 @@ msgstr "Usuários"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr "Excluir"
+msgstr "Remover"
#: templates/settings.php:129
msgid "Enable User External Storage"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index cbd0b6110f..52bc451ea0 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <philippi.sedir@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -45,4 +46,4 @@ msgstr "Nenhuma visualização disponÃvel para"
#: templates/public.php:50
msgid "web services under your control"
-msgstr "serviços web sob seu controle"
+msgstr "web services sob seu controle"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 8336eefd7e..728344416d 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 133e452f03..7274496348 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dudanogueira@gmail.com>, 2013.
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
+# <tbsoares@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index d2ecaa0216..b6f5ca1cf8 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# dudanogueira <dudanogueira@gmail.com>, 2012
+# fboaventura <fboaventura@live.com>, 2013
+# Schopfer <glauber.guimaraes@poli.ufrj.br>, 2012
+# sedir <philippi.sedir@gmail.com>, 2012
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +118,72 @@ msgstr "%s você não pode usar pontos no nome do banco de dados"
msgid "%s set the database host."
msgstr "%s defina o host do banco de dados."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Você precisa inserir uma conta existente ou o administrador."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erro no BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Comando ofensivo era: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O usuário MySQL '%s'@'localhost' já existe."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Derrubar este usuário do MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuário MySQL '%s'@'%%' já existe"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Derrube este usuário do MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
@@ -235,6 +240,19 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s está disponÃvel. Obtenha <a href=\"%s\">mais informações</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "atualizado"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "checagens de atualização estão desativadas"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9bd9a0bb7f..c7c53c3952 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -3,14 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# <duda.nogueira@metasys.com.br>, 2011.
+# Frederico Freire Boaventura <fboaventura@live.com>, 2013.
+# <fred.maranhao@gmail.com>, 2012.
+# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
+# Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
+# <targinosilveira@gmail.com>, 2012.
+# Thiago Vicente <thiagovice@gmail.com>, 2012.
+# <thoriumbr@gmail.com>, 2012.
+# Van Der Fran <transifex@vanderland.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 11:20+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +32,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Não foi possÃvel carregar lista da App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Erro de autenticação"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "A exibição de seu nome foi alterada."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "ImpossÃvel alterar nome de exibição"
@@ -49,7 +55,7 @@ msgstr "Não foi possÃvel habilitar aplicativo."
#: ajax/lostpassword.php:12
msgid "Email saved"
-msgstr "E-mail salvo"
+msgstr "E-mail guardado"
#: ajax/lostpassword.php:14
msgid "Invalid email"
@@ -73,7 +79,7 @@ msgstr "Pedido inválido"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr "Admins não podem ser removidos do grupo admin"
+msgstr "Admins não podem se remover do grupo admin"
#: ajax/togglegroups.php:30
#, php-format
@@ -87,7 +93,7 @@ msgstr "Não foi possÃvel remover usuário do grupo %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr "Não foi possÃvel atualizar a app."
+msgstr "Não foi possÃvel atualizar o app."
#: js/apps.js:30
msgid "Update to {appversion}"
@@ -121,9 +127,9 @@ msgstr "Erro ao atualizar aplicativo"
msgid "Updated"
msgstr "Atualizado"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Salvando..."
+msgstr "Guardando..."
#: js/users.js:43
msgid "deleted"
@@ -137,16 +143,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "ImpossÃvel remover usuário"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Excluir"
@@ -166,7 +172,7 @@ msgstr "Erro ao criar usuário"
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Português (Brasil)"
@@ -191,12 +197,12 @@ msgstr "Aviso de Configuração"
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando."
+msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Por favor, confira o <a href='%s'>guia de instalação</a>."
+msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -317,19 +323,19 @@ msgstr "Registro"
msgid "Log level"
msgstr "NÃvel de registro"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Mais"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +406,7 @@ msgstr "Faça com que os apps sincronize seus arquivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar este Assistente de novo"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Senha"
@@ -424,70 +430,82 @@ msgstr "Nova senha"
msgid "Change password"
msgstr "Alterar senha"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nome de Exibição"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Seu nome de exibição foi alterado"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "ImpossÃvel alterar seu nome de exibição"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Alterar nome de exibição"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Seu endereço de e-mail"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nome de Login"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Criar"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "alterar nome de exibição"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "definir nova senha"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 04273762bd..54d37d885b 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dudanogueira@gmail.com>, 2013.
+# Marcos Rodrigo Ladeia <marcosrodrigo.ladeia@gmail.com>, 2013.
+# <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 9fd8df290b..cde8bb6189 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012-2013.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# <duartegrilo@gmail.com>, 2013.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# <helder.meneses@gmail.com>, 2011, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
+# Nelson Rosado <nelsontrosado@gmail.com>, 2012.
+# <rjgpp.1994@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +81,7 @@ msgstr "Erro a adicionar %s aos favoritos"
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria seleccionada para eliminar."
+msgstr "Nenhuma categoria seleccionada para apagar"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -158,7 +166,7 @@ msgstr "Dezembro"
#: js/js.js:286
msgid "Settings"
-msgstr "Configurações"
+msgstr "Definições"
#: js/js.js:718
msgid "seconds ago"
@@ -174,7 +182,7 @@ msgstr "{minutes} minutos atrás"
#: js/js.js:721
msgid "1 hour ago"
-msgstr "Há 1 horas"
+msgstr "Há 1 hora"
#: js/js.js:722
msgid "{hours} hours ago"
@@ -293,9 +301,9 @@ msgstr "Partilhar com link"
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
-msgstr "Password"
+msgstr "Palavra chave"
#: js/share.js:173
msgid "Email link to person"
@@ -396,27 +404,24 @@ msgstr "Reposição da password ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Use o seguinte endereço para repor a sua password: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Vai receber um endereço para repor a sua password"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "E-mail de reinicialização enviado."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "O pedido falhou!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Nome de utilizador"
+msgstr "Utilizador"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Pedir reposição"
@@ -430,7 +435,7 @@ msgstr "Para a página de entrada"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "Nova palavra-chave"
+msgstr "Nova password"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -522,37 +527,37 @@ msgstr "Avançado"
msgid "Data folder"
msgstr "Pasta de dados"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configure a base de dados"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "vai ser usada"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Utilizador da base de dados"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Password da base de dados"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Nome da base de dados"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tablespace da base de dados"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Anfitrião da base de dados"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Acabar instalação"
@@ -560,42 +565,37 @@ msgstr "Acabar instalação"
msgid "web services under your control"
msgstr "serviços web sob o seu controlo"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Sair"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Login automático rejeitado!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Esqueceu-se da sua password?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Contas de acesso alternativas"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 664e95876a..6794c27ed3 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012-2013.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# <duartegrilo@gmail.com>, 2013.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# <geral@ricardolameiro.pt>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
+# Miguel Sousa <migueljorgesousa@sapo.pt>, 2013.
+# <rjgpp.1994@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +45,7 @@ msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Não ocorreram erros, o ficheiro foi submetido com sucesso"
+msgstr "Sem erro, ficheiro enviado com sucesso"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +56,19 @@ msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upl
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
+msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
+msgstr "O ficheiro enviado só foi enviado parcialmente"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nenhum ficheiro foi submetido"
+msgstr "Não foi enviado nenhum ficheiro"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Está a faltar a pasta temporária"
+msgstr "Falta uma pasta temporária"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +86,15 @@ msgstr "Directório Inválido"
msgid "Files"
msgstr "Ficheiros"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Partilhar"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "Eliminar"
+msgstr "Apagar"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Renomear"
@@ -221,7 +225,7 @@ msgstr "{count} ficheiros"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Carregar"
+msgstr "Enviar"
#: templates/admin.php:5
msgid "File handling"
@@ -237,7 +241,7 @@ msgstr "max. possivel: "
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Necessário para multi download de ficheiros e pastas"
+msgstr "Necessário para descarregamento múltiplo de ficheiros e pastas"
#: templates/admin.php:17
msgid "Enable ZIP-download"
@@ -297,13 +301,13 @@ msgstr "Deixar de partilhar"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Upload muito grande"
+msgstr "Envio muito grande"
#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
+msgstr "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor."
#: templates/index.php:115
msgid "Files are being scanned, please wait."
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index d8cfa5891f..5b7f52b371 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 4941cbba20..583bb3bfaf 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
msgid "Error configuring Google Drive storage"
msgstr "Erro ao configurar o armazenamento do Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possÃvel montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possÃvel montar as partilhas FTP. Peça ao seu administrador para instalar."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Armazenamento Externo"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 91d49b0b9a..913b52dd57 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index bc0ceb89d5..187d7ecf91 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# Helder Meneses <helder.meneses@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +79,7 @@ msgstr "Restaurar"
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
-msgstr "Eliminar"
+msgstr "Apagar"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 7cfc0d4b7f..102a1060df 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 73f120fd81..0091021228 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mouxy <daniel@mouxy.net>, 2012-2013
+# Mouxy <daniel@mouxy.net>, 2013
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012
+# Helder Meneses <helder.meneses@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -113,83 +117,83 @@ msgstr "%s não é permitido utilizar pontos (.) no nome da base de dados"
msgid "%s set the database host."
msgstr "%s defina o servidor da base de dados (geralmente localhost)"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de utilizador/password do PostgreSQL inválido"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Precisa de introduzir uma conta existente ou de administrador"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Nome de utilizador/password do Oracle inválida"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Nome de utilizador/password do MySQL inválida"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erro na BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "O comando gerador de erro foi: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Eliminar este utilizador do MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "O utilizador '%s'@'%%' do MySQL já existe"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Eliminar este utilizador do MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de utilizador/password do MySQL é inválido: %s"
-#: setup.php:858
+#: setup.php:853
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 não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor verifique <a href='%s'>installation guides</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "Minutos atrás"
+msgstr "há alguns segundos"
#: template.php:114
msgid "1 minute ago"
-msgstr "Há 1 minuto"
+msgstr "há 1 minuto"
#: template.php:115
#, php-format
@@ -220,7 +224,7 @@ msgstr "há %d dias"
#: template.php:121
msgid "last month"
-msgstr "ultÃmo mês"
+msgstr "mês passado"
#: template.php:122
#, php-format
@@ -233,7 +237,20 @@ msgstr "ano passado"
#: template.php:124
msgid "years ago"
-msgstr "anos atrás"
+msgstr "há anos"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s está disponÃvel. Obtenha <a href=\"%s\">mais informação</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "actualizado"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "a verificação de actualizações está desligada"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index c9af2137f5..a0be25c84b 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# <duartegrilo@gmail.com>, 2013.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012-2013.
+# <geral@ricardolameiro.pt>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
+# Miguel Sousa <migueljorgesousa@sapo.pt>, 2013.
+# <rjgpp.1994@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +29,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Incapaz de carregar a lista da App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Erro na autenticação"
+msgstr "Erro de autenticação"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Não foi possÃvel alterar o nome"
@@ -68,7 +72,7 @@ msgstr "Idioma alterado"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Pedido Inválido"
+msgstr "Pedido inválido"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +124,7 @@ msgstr "Erro enquanto actualizava a aplicação"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "A guardar..."
@@ -136,18 +140,18 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Não foi possÃvel remover o utilizador"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "Eliminar"
+msgstr "Apagar"
#: js/users.js:262
msgid "add group"
@@ -165,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:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -316,19 +320,19 @@ msgstr "Registo"
msgid "Log level"
msgstr "NÃvel do registo"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Mais"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +403,9 @@ msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
msgid "Show First Run Wizard again"
msgstr "Mostrar novamente Wizard de Arranque Inicial"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
-msgstr "Password"
+msgstr "Palavra-chave"
#: templates/personal.php:38
msgid "Your password was changed"
@@ -423,70 +427,82 @@ msgstr "Nova palavra-chave"
msgid "Change password"
msgstr "Alterar palavra-chave"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nome público"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "O seu nome foi alterado"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Não foi possÃvel alterar o seu nome"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Alterar nome"
#: templates/personal.php:70
+msgid "Email"
+msgstr "endereço de email"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "O seu endereço de email"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Nome de utilizador"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Criar"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "modificar nome exibido"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "definir nova palavra-passe"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index d5ad8a47f5..a5106e4055 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012-2013.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
+# Nelson Rosado <nelsontrosado@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +129,7 @@ msgstr "O DN to cliente "
#: templates/settings.php:46
msgid "Password"
-msgstr "Password"
+msgstr "Palavra-passe"
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index a5db03c655..35676e96cf 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -3,13 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ripkid666 <ripkid666@gmail.com>, 2013
+# Claudiu <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
+# Dumitru Ursu <>, 2013.
+# Eugen Mihalache <eugemjj@gmail.com>, 2012.
+# <g.ciprian@osn.ro>, 2012.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -53,7 +58,7 @@ msgstr "Nici o categorie de adăugat?"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr "Această categorie deja există: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -159,7 +164,7 @@ msgstr "Decembrie"
#: js/js.js:286
msgid "Settings"
-msgstr "Setări"
+msgstr "Configurări"
#: js/js.js:718
msgid "seconds ago"
@@ -256,7 +261,7 @@ msgstr "Fișierul obligatoriu {file} nu este instalat!"
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
-msgstr "Partajat"
+msgstr ""
#: js/share.js:90
msgid "Share"
@@ -294,9 +299,9 @@ msgstr "Partajare cu legătură"
msgid "Password protect"
msgstr "Protejare cu parolă"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
-msgstr "Parolă"
+msgstr "Parola"
#: js/share.js:173
msgid "Email link to person"
@@ -383,11 +388,11 @@ msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>."
+msgstr ""
#: js/update.js:18
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Modernizare reusita! Vei fii redirectionat!"
+msgstr ""
#: lostpassword/controller.php:48
msgid "ownCloud password reset"
@@ -397,27 +402,24 @@ msgstr "Resetarea parolei ownCloud "
msgid "Use the following link to reset your password: {link}"
msgstr "Folosește următorul link pentru a reseta parola: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Vei primi un mesaj prin care vei putea reseta parola via email"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Resetarea emailu-lui trimisa."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Solicitarea nu a reusit"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Nume utilizator"
+msgstr "Utilizator"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Cerere trimisă"
@@ -451,7 +453,7 @@ msgstr "Aplicații"
#: strings.php:8
msgid "Admin"
-msgstr "Admin"
+msgstr "Administrator"
#: strings.php:9
msgid "Help"
@@ -467,7 +469,7 @@ msgstr "Nu s-a găsit"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Editează categorii"
+msgstr "Editează categoriile"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -480,11 +482,11 @@ msgstr "Avertisment de securitate"
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "Versiunea dvs. PHP este vulnerabil la acest atac un octet null (CVE-2006-7243)"
+msgstr ""
#: templates/installation.php:26
msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Vă rugăm să actualizați instalarea dvs. PHP pentru a utiliza ownCloud in siguranță."
+msgstr ""
#: templates/installation.php:32
msgid ""
@@ -502,14 +504,14 @@ msgstr "Fara generatorul pentru numere de securitate , un atacator poate afla pa
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr "Directorul de date și fișiere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcționează."
+msgstr ""
#: templates/installation.php:40
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
"target=\"_blank\">documentation</a>."
-msgstr "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>."
+msgstr ""
#: templates/installation.php:44
msgid "Create an <strong>admin account</strong>"
@@ -523,37 +525,37 @@ msgstr "Avansat"
msgid "Data folder"
msgstr "Director date"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Configurează baza de date"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "vor fi folosite"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Utilizatorul bazei de date"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Parola bazei de date"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Numele bazei de date"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tabela de spațiu a bazei de date"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Bază date"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Finalizează instalarea"
@@ -561,44 +563,39 @@ msgstr "Finalizează instalarea"
msgid "web services under your control"
msgstr "servicii web controlate de tine"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Ieșire"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Logare automata respinsa"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ai uitat parola?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "amintește"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Autentificare"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
-msgstr "Conectări alternative"
+msgstr ""
#: templates/part.pagenavi.php:3
msgid "prev"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 5b878d86c2..e15f6abff9 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,14 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# ripkid666 <ripkid666@gmail.com>, 2013
+# Claudiu <claudiu@tanaselia.ro>, 2011-2013.
+# Dimon Pockemon <>, 2012.
+# Dumitru Ursu <>, 2013.
+# Eugen Mihalache <eugemjj@gmail.com>, 2012.
+# <g.ciprian@osn.ro>, 2012-2013.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:00+0000\n"
-"Last-Translator: ripkid666 <ripkid666@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +43,7 @@ msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
+msgstr "Nicio eroare, fișierul a fost încărcat cu succes"
#: ajax/upload.php:27
msgid ""
@@ -57,11 +62,11 @@ msgstr "Fișierul a fost încărcat doar parțial"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Nu a fost încărcat nici un fișier"
+msgstr "Niciun fișier încărcat"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Lipsește un director temporar"
+msgstr "Lipsește un dosar temporar"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -69,7 +74,7 @@ msgstr "Eroare la scriere pe disc"
#: ajax/upload.php:51
msgid "Not enough storage available"
-msgstr "Nu este suficient spațiu disponibil"
+msgstr ""
#: ajax/upload.php:83
msgid "Invalid directory."
@@ -79,19 +84,15 @@ msgstr "Director invalid."
msgid "Files"
msgstr "Fișiere"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Partajează"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
-msgstr "Stergere permanenta"
+msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Șterge"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Redenumire"
@@ -125,7 +126,7 @@ msgstr "Anulează ultima acțiune"
#: js/filelist.js:324
msgid "perform delete operation"
-msgstr "efectueaza operatiunea de stergere"
+msgstr ""
#: js/filelist.js:406
msgid "1 file uploading"
@@ -133,7 +134,7 @@ msgstr "un fișier se încarcă"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "fișiere se încarcă"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -151,11 +152,11 @@ msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt pe
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere."
+msgstr ""
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)"
+msgstr ""
#: js/files.js:226
msgid ""
@@ -222,7 +223,7 @@ msgstr "{count} fisiere"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Încărcare"
+msgstr "Încarcă"
#: templates/admin.php:5
msgid "File handling"
@@ -254,7 +255,7 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
#: templates/admin.php:26
msgid "Save"
-msgstr "Salvează"
+msgstr "Salvare"
#: templates/index.php:7
msgid "New"
@@ -274,7 +275,7 @@ msgstr "de la adresa"
#: templates/index.php:42
msgid "Deleted files"
-msgstr "Sterge fisierele"
+msgstr ""
#: templates/index.php:48
msgid "Cancel upload"
@@ -282,7 +283,7 @@ msgstr "Anulează încărcarea"
#: templates/index.php:55
msgid "You don’t have write permissions here."
-msgstr "Nu ai permisiunea de a sterge fisiere aici."
+msgstr ""
#: templates/index.php:62
msgid "Nothing in here. Upload something!"
@@ -294,7 +295,7 @@ msgstr "Descarcă"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Anulare partajare"
+msgstr "Anulează partajarea"
#: templates/index.php:108
msgid "Upload too large"
@@ -316,4 +317,4 @@ msgstr "ÃŽn curs de scanare"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "Modernizare fisiere de sistem cache.."
+msgstr ""
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 91a23afb23..a4aa0e05df 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dumitru Ursu <>, 2013.
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 1823f0d97d..104dee1532 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dumitru Ursu <>, 2013.
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "Prezintă te rog o cheie de Dropbox validă și parola"
msgid "Error configuring Google Drive storage"
msgstr "Eroare la configurarea mediului de stocare Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Atentie:</b> Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!"
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Stocare externă"
@@ -67,7 +62,7 @@ msgstr "Denumire director"
#: templates/settings.php:10
msgid "External storage"
-msgstr "Stocare externă"
+msgstr ""
#: templates/settings.php:11
msgid "Configuration"
@@ -83,7 +78,7 @@ msgstr "Aplicabil"
#: templates/settings.php:33
msgid "Add storage"
-msgstr "Adauga stocare"
+msgstr ""
#: templates/settings.php:90
msgid "None set"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index c6b95b1070..6dfb5310d7 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0691654cd6..1c2d7260a9 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-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr ""
#: js/trash.js:121
msgid "Delete permanently"
-msgstr "Stergere permanenta"
+msgstr ""
#: js/trash.js:174 templates/index.php:17
msgid "Name"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 4ae67ab2bc..0648c9a78c 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -20,38 +21,38 @@ msgstr ""
#: ajax/rollbackVersion.php:15
#, php-format
msgid "Could not revert: %s"
-msgstr "Nu a putut reveni: %s"
+msgstr ""
#: history.php:40
msgid "success"
-msgstr "success"
+msgstr ""
#: history.php:42
#, php-format
msgid "File %s was reverted to version %s"
-msgstr "Fisierul %s a revenit la versiunea %s"
+msgstr ""
#: history.php:49
msgid "failure"
-msgstr "eșec"
+msgstr ""
#: history.php:51
#, php-format
msgid "File %s could not be reverted to version %s"
-msgstr "Fisierele %s nu au putut reveni la versiunea %s"
+msgstr ""
#: history.php:69
msgid "No old versions available"
-msgstr "Versiunile vechi nu sunt disponibile"
+msgstr ""
#: history.php:74
msgid "No path specified"
-msgstr "Nici un dosar specificat"
+msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "Versiuni"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Readuceti un fișier la o versiune anterioară, făcând clic pe butonul revenire"
+msgstr ""
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 7d85c7044f..9508b63732 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dimon Pockemon <>, 2013
+# g.ciprian <g.ciprian@osn.ro>, 2012
+# laurentiucristescu <laur.cristescu@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +116,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +238,19 @@ msgstr "ultimul an"
msgid "years ago"
msgstr "ani în urmă"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "la zi"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "verificarea după actualizări este dezactivată"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 28af7d896f..942cb3c8ed 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Claudiu <claudiu@tanaselia.ro>, 2011, 2012.
+# Dimon Pockemon <>, 2012.
+# Dumitru Ursu <>, 2013.
+# Eugen Mihalache <eugemjj@gmail.com>, 2012.
+# <g.ciprian@osn.ro>, 2012-2013.
+# <icewind1991@gmail.com>, 2012.
+# <iuranemo@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:10+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +28,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Imposibil de încărcat lista din App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Eroare la autentificare"
+msgstr "Eroare de autentificare"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -98,7 +101,7 @@ msgstr "Dezactivați"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Activare"
+msgstr "Activați"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,9 +123,9 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Se salvează..."
+msgstr "Salvez..."
#: js/users.js:43
msgid "deleted"
@@ -136,16 +139,16 @@ msgstr "Anulează ultima acțiune"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Șterge"
@@ -165,7 +168,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_language_name_"
@@ -235,59 +238,59 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "Execută o sarcină la fiecare pagină încărcată"
+msgstr ""
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http."
+msgstr ""
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut."
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Partajare"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Activare API partajare"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "Permite aplicațiilor să folosească API-ul de partajare"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "Pemite legături"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "Permite repartajarea"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "Permite utilizatorilor să partajeze cu oricine"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +313,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Jurnal de activitate"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "Nivel jurnal"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Mai mult"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Mai puțin"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Versiunea"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -393,13 +396,13 @@ msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
#: templates/personal.php:15
msgid "Get the apps to sync your files"
-msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
+msgstr ""
#: templates/personal.php:26
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Parolă"
@@ -423,70 +426,82 @@ msgstr "Noua parolă"
msgid "Change password"
msgstr "Schimbă parola"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Adresa ta de email"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Limba"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ajută la traducere"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Crează"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Stocare implicită"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Nelimitată"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Altele"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Stocare"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 9dab61a2a4..7d04a5cc4f 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dumitru Ursu <>, 2012-2013.
+# <iuranemo@gmail.com>, 2012.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 5cb4935c7f..6f4f8a3c68 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,13 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Vyacheslav Muranov <s@neola.ru>, 2013
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <jekader@gmail.com>, 2011, 2012.
+# <k0ldbl00d@gmail.com>, 2012.
+# Mihail Vasiliev <mickvav@gmail.com>, 2012.
+# <semen@sam002.net>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
+# <sharov3@gmail.com>, 2013.
+# <skoptev@ukr.net>, 2012.
+# <tony.mccourin@gmail.com>, 2011.
+# Victor Bravo <>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -159,7 +170,7 @@ msgstr "Декабрь"
#: js/js.js:286
msgid "Settings"
-msgstr "КонфигурациÑ"
+msgstr "ÐаÑтройки"
#: js/js.js:718
msgid "seconds ago"
@@ -219,7 +230,7 @@ msgstr "Ок"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr "Отменить"
+msgstr "Отмена"
#: js/oc-dialogs.js:185
msgid "Choose"
@@ -294,7 +305,7 @@ msgstr "ПоделитьÑÑ Ñ ÑÑылкой"
msgid "Password protect"
msgstr "Защитить паролем"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Пароль"
@@ -397,27 +408,24 @@ msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ "
msgid "Use the following link to reset your password: {link}"
msgstr "ИÑпользуйте Ñледующую ÑÑылку чтобы ÑброÑить пароль: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "СÑылка Ð´Ð»Ñ ÑброÑа Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð±Ñ‹Ð»Ð° отправлена ​​по Ñлектронной почте. <br> ЕÑли вы не получите его в пределах одной двух минут, проверьте папку Ñпам. <br> ЕÑли Ñто не возможно, обратитеÑÑŒ к Вашему админиÑтратору."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Что-то не так. Ð’Ñ‹ уверены что Email / Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ñ‹ верно?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Ðа ваш Ð°Ð´Ñ€ÐµÑ Email выÑлана ÑÑылка Ð´Ð»Ñ ÑброÑа паролÑ."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "ЗапроÑить ÑброÑ"
@@ -451,7 +459,7 @@ msgstr "ПриложениÑ"
#: strings.php:8
msgid "Admin"
-msgstr "Admin"
+msgstr "ÐдминиÑтратор"
#: strings.php:9
msgid "Help"
@@ -467,7 +475,7 @@ msgstr "Облако не найдено"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Редактировать категрии"
+msgstr "Редактировать категории"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -523,80 +531,75 @@ msgstr "Дополнительно"
msgid "Data folder"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "ÐаÑтройка базы данных"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "будет иÑпользовано"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ данных"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Пароль Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ данных"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Ðазвание базы данных"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Табличое проÑтранÑтво базы данных"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "ХоÑÑ‚ базы данных"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Завершить уÑтановку"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "веб-ÑервиÑÑ‹ под вашим управлением"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "Сетевые Ñлужбы под твоим контролем"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Выйти"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "ÐвтоматичеÑкий вход в ÑиÑтему отключен!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "ЕÑли Ð’Ñ‹ недавно не менÑли Ñвой пароль, то Ваша ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ может быть Ñкомпрометирована!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "ПожалуйÑта, Ñмените пароль, чтобы обезопаÑить Ñвою учетную запиÑÑŒ."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Забыли пароль?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "запомнить"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Войти"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Ðльтернативные имена пользователÑ"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 0493878feb..d532da2e90 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,12 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <jekader@gmail.com>, 2012.
+# <lankme@gmail.com>, 2012.
+# <mpolr21@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
+# <semen@sam002.net>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
+# <sharov3@gmail.com>, 2013.
+# <skoptev@ukr.net>, 2012.
+# <tony.mccourin@gmail.com>, 2011.
+# Victor Ashirov <victor.ashirov@gmail.com>, 2013.
+# Victor Bravo <>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +51,7 @@ msgstr "Файл не был загружен. ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±Ðº
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Файл загружен уÑпешно."
+msgstr "Файл уÑпешно загружен"
#: ajax/upload.php:27
msgid ""
@@ -48,11 +62,11 @@ msgstr "Файл превышает размер уÑтановленный uplo
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Загружаемый файл превоÑходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
+msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Файл загружен чаÑтично"
+msgstr "Файл был загружен не полноÑтью"
#: ajax/upload.php:31
msgid "No file was uploaded"
@@ -60,7 +74,7 @@ msgstr "Файл не был загружен"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "ОтÑутÑтвует Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°"
+msgstr "Ðевозможно найти временную папку"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +92,15 @@ msgstr "Ðеправильный каталог."
msgid "Files"
msgstr "Файлы"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Открыть доÑтуп"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Удалено навÑегда"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Удалить"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Переименовать"
@@ -132,7 +142,7 @@ msgstr "загружаетÑÑ 1 файл"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "файлы загружаютÑÑ"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +174,7 @@ msgstr "Загрузка началаÑÑŒ. Ðто может потребова
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Файл не был загружен: его размер 0 байт либо Ñто не файл, а директориÑ."
+msgstr "Ðе удаетÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ файл размером 0 байт в каталог"
#: js/files.js:272
msgid "Not enough space available"
@@ -193,7 +203,7 @@ msgstr "Ошибка"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "ИмÑ"
+msgstr "Ðазвание"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -221,7 +231,7 @@ msgstr "{count} файлов"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Загрузка"
+msgstr "Загрузить"
#: templates/admin.php:5
msgid "File handling"
@@ -293,11 +303,11 @@ msgstr "Скачать"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Закрыть общий доÑтуп"
+msgstr "Отменить публикацию"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Файл Ñлишком велик"
+msgstr "Файл Ñлишком большой"
#: templates/index.php:110
msgid ""
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index a43bdd216c..414201060b 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "ИÑключить Ñледующие типы файлов из шиф
#: templates/settings.php:12
msgid "None"
-msgstr "Ðет новоÑтей"
+msgstr "Ðичего"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index e418fb322c..5054c5c61d 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <semen@sam002.net>, 2012.
+# <skoptev@ukr.net>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +41,19 @@ msgstr "ПожалуйÑта, предоÑтавьте дейÑтвующий к
msgid "Error configuring Google Drive storage"
msgstr "Ошибка при наÑтройке хранилища Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Внимание:</b> \"smbclient\" не уÑтановлен. Подключение по CIFS/SMB невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы уÑтановить его."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы включить."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Внимание:</b> Поддержка Curl в PHP не включена или не уÑтановлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. ПопроÑите вашего ÑиÑтемного админиÑтратора уÑтановить его."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Внешний ноÑитель"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 0e1c7422f8..1278347ec8 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <iuranemo@gmail.com>, 2012.
+# <skoptev@ukr.net>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 28de0c794c..45af8ef813 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 24bebd364f..da5a0e0228 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <skoptev@ukr.net>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 79b382794b..e6a61975e2 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Denis <reg.transifex.net@demitel.ru>, 2013
+# Denis <reg.transifex.net@demitel.ru>, 2012
+# k0ldbl00d <k0ldbl00d@gmail.com>, 2012
+# Mihail Vasiliev <mickvav@gmail.com>, 2012
+# mPolr <mpolr21@gmail.com>, 2012
+# m4rkell <sergey@markevich.ru>, 2013
+# VicDeo <victor.dubiniuk@gmail.com>, 2012
+# Langaru <langaru@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +35,7 @@ msgstr "Личное"
#: app.php:373
msgid "Settings"
-msgstr "КонфигурациÑ"
+msgstr "ÐаÑтройки"
#: app.php:385
msgid "Users"
@@ -113,79 +121,79 @@ msgstr "%s Ð’Ñ‹ не можете иÑпользовать точки в име
msgid "%s set the database host."
msgstr "%s задайте хоÑÑ‚ базы данных."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль PostgreSQL"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Ð’Ñ‹ должны войти или в ÑущеÑтвующий аккаунт или под админиÑтратором."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Ошибка БД: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Удалить Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Удалить Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\", имÑ: %s, пароль: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MS SQL не подходит: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "неÑколько Ñекунд назад"
+msgstr "менее минуты"
#: template.php:114
msgid "1 minute ago"
@@ -233,7 +241,20 @@ msgstr "в прошлом году"
#: template.php:124
msgid "years ago"
-msgstr "неÑколько лет назад"
+msgstr "годы назад"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>"
+
+#: 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
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 29b575a006..2b06278427 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,14 +3,28 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# eurekafag <eurekafag@eureka7.ru>, 2013
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <icewind1991@gmail.com>, 2012.
+# <jekader@gmail.com>, 2012.
+# <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@gmail.com>, 2012.
+# <rasperepodvipodvert@gmail.com>, 2012.
+# <semen@sam002.net>, 2012.
+# Sergey <sergey@markevich.ru>, 2013.
+# <sharov3@gmail.com>, 2012-2013.
+# <skoptev@ukr.net>, 2012.
+# <tony.mccourin@gmail.com>, 2011.
+# Victor Ashirov <victor.ashirov@gmail.com>, 2013.
+# Victor Bravo <>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +36,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Загрузка из App Store запрещена"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Ошибка аутентификации"
+msgstr "Ошибка авторизации"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Ваше отображаемое Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ изменено."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Ðевозможно изменить отображаемое имÑ"
@@ -69,7 +79,7 @@ msgstr "Язык изменён"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Ðеправильный запроÑ"
+msgstr "Ðеверный запроÑ"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -121,7 +131,7 @@ msgstr "Ошибка в процеÑÑе Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸
msgid "Updated"
msgstr "Обновлено"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Сохранение..."
@@ -137,16 +147,16 @@ msgstr "отмена"
msgid "Unable to remove user"
msgstr "Ðевозможно удалить пользователÑ"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Группы"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Группа ÐдминиÑтраторы"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Удалить"
@@ -166,7 +176,7 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
msgid "A valid password must be provided"
msgstr "ПредоÑтавте подходÑщий пароль"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "РуÑÑкий "
@@ -317,19 +327,19 @@ msgstr "Лог"
msgid "Log level"
msgstr "Уровень лога"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Больше"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "ВерÑиÑ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +410,7 @@ msgstr "Получить Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñинхронизации
msgid "Show First Run Wizard again"
msgstr "Показать помощник наÑтройки"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Пароль"
@@ -424,70 +434,82 @@ msgstr "Ðовый пароль"
msgid "Change password"
msgstr "Сменить пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Отображаемое имÑ"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "E-mail"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Ваше отображаемое Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ изменено"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Ðевозможно изменить Ваше отображаемое имÑ"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Изменить отображаемое имÑ"
#: templates/personal.php:70
+msgid "Email"
+msgstr "e-mail"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Ваш Ð°Ð´Ñ€ÐµÑ Ñлектронной почты"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
-msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты чтобы поÑвилаÑÑŒ возможноÑÑ‚ÑŒ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
+msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты, чтобы поÑвилаÑÑŒ возможноÑÑ‚ÑŒ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Язык"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Помочь Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ИÑпользуйте Ñтот URL Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ менеджера к Вашему хранилищу"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Создать"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Хранилище по-умолчанию"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ðеограниченно"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Другое"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "изменить отображаемое имÑ"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "уÑтановить новый пароль"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "По-умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index cd1cb84f03..96e71415b2 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <4671992@gmail.com>, 2012.
+# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <semen@sam002.net>, 2012.
+# Victor Ashirov <victor.ashirov@gmail.com>, 2013.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index bfbe3274c4..b6aa78f2ae 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -3,14 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2013.
+# <cdewqazxsqwe@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,141 +23,141 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доÑтуп к файлу"
#: ajax/share.php:99
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доÑтуп к папке"
#: ajax/share.php:101
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доÑтуп к файлу \"%s\". Он доÑтупен Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ здеÑÑŒ: %s"
#: ajax/share.php:104
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доÑтуп к папке \"%s\". Она доÑтупена Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ здеÑÑŒ: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Тип категории не предоÑтавлен."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
-msgstr ""
+msgstr "Ðет категории Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ?"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr ""
+msgstr "Ðта ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÑƒÐ¶Ðµ ÑущеÑтвует: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Тип объекта не предоÑтавлен."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID не предоÑтавлен."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Ошибка Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s в избранное."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ðет категорий, выбранных Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s из избранного."
#: js/config.php:34
msgid "Sunday"
-msgstr ""
+msgstr "ВоÑкреÑенье"
#: js/config.php:35
msgid "Monday"
-msgstr ""
+msgstr "Понедельник"
#: js/config.php:36
msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
#: js/config.php:37
msgid "Wednesday"
-msgstr ""
+msgstr "Среда"
#: js/config.php:38
msgid "Thursday"
-msgstr ""
+msgstr "Четверг"
#: js/config.php:39
msgid "Friday"
-msgstr ""
+msgstr "ПÑтница"
#: js/config.php:40
msgid "Saturday"
-msgstr ""
+msgstr "Суббота"
#: js/config.php:45
msgid "January"
-msgstr ""
+msgstr "Январь"
#: js/config.php:46
msgid "February"
-msgstr ""
+msgstr "Февраль"
#: js/config.php:47
msgid "March"
-msgstr ""
+msgstr "Март"
#: js/config.php:48
msgid "April"
-msgstr ""
+msgstr "Ðпрель"
#: js/config.php:49
msgid "May"
-msgstr ""
+msgstr "Май"
#: js/config.php:50
msgid "June"
-msgstr ""
+msgstr "Июнь"
#: js/config.php:51
msgid "July"
-msgstr ""
+msgstr "Июль"
#: js/config.php:52
msgid "August"
-msgstr ""
+msgstr "ÐвгуÑÑ‚"
#: js/config.php:53
msgid "September"
-msgstr ""
+msgstr "СентÑбрь"
#: js/config.php:54
msgid "October"
-msgstr ""
+msgstr "ОктÑбрь"
#: js/config.php:55
msgid "November"
-msgstr ""
+msgstr "ÐоÑбрь"
#: js/config.php:56
msgid "December"
-msgstr ""
+msgstr "Декабрь"
#: js/js.js:286
msgid "Settings"
@@ -162,80 +165,80 @@ msgstr "ÐаÑтройки"
#: js/js.js:718
msgid "seconds ago"
-msgstr ""
+msgstr "Ñекунд назад"
#: js/js.js:719
msgid "1 minute ago"
-msgstr ""
+msgstr " 1 минуту назад"
#: js/js.js:720
msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{минуты} минут назад"
#: js/js.js:721
msgid "1 hour ago"
-msgstr ""
+msgstr "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
#: js/js.js:722
msgid "{hours} hours ago"
-msgstr ""
+msgstr "{чаÑÑ‹} чаÑов назад"
#: js/js.js:723
msgid "today"
-msgstr ""
+msgstr "ÑегоднÑ"
#: js/js.js:724
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
#: js/js.js:725
msgid "{days} days ago"
-msgstr ""
+msgstr "{дни} дней назад"
#: js/js.js:726
msgid "last month"
-msgstr ""
+msgstr "в прошлом меÑÑце"
#: js/js.js:727
msgid "{months} months ago"
-msgstr ""
+msgstr "{меÑÑцы} меÑÑцев назад"
#: js/js.js:728
msgid "months ago"
-msgstr ""
+msgstr "меÑÑц назад"
#: js/js.js:729
msgid "last year"
-msgstr ""
+msgstr "в прошлом году"
#: js/js.js:730
msgid "years ago"
-msgstr ""
+msgstr "лет назад"
#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
msgid "Ok"
-msgstr ""
+msgstr "Да"
#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
#: js/oc-dialogs.js:185
msgid "Choose"
-msgstr ""
+msgstr "Выбрать"
#: js/oc-dialogs.js:215
msgid "Yes"
-msgstr ""
+msgstr "Да"
#: js/oc-dialogs.js:222
msgid "No"
-msgstr ""
+msgstr "Ðет"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Тип объекта не указан."
#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
@@ -243,239 +246,236 @@ msgstr ""
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ указано."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Требуемый файл {файл} не уÑтановлен!"
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
-msgstr ""
+msgstr "Опубликовано"
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "Сделать общим"
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
-msgstr ""
+msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ доÑтупа"
#: js/share.js:136
msgid "Error while unsharing"
-msgstr ""
+msgstr "Ошибка Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ доÑтупа"
#: js/share.js:143
msgid "Error while changing permissions"
-msgstr ""
+msgstr "Ошибка при изменении прав доÑтупа"
#: js/share.js:152
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Опубликовано Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ группы {группа} {ÑобÑтвенник}"
#: js/share.js:154
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Опубликовано Ð´Ð»Ñ Ð’Ð°Ñ {ÑобÑтвенник}"
#: js/share.js:159
msgid "Share with"
-msgstr ""
+msgstr "Сделать общим Ñ"
#: js/share.js:164
msgid "Share with link"
-msgstr ""
+msgstr "Опубликовать Ñ ÑÑылкой"
#: js/share.js:167
msgid "Password protect"
-msgstr ""
+msgstr "Защитить паролем"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
-msgstr ""
+msgstr "Пароль"
#: js/share.js:173
msgid "Email link to person"
-msgstr ""
+msgstr "СÑылка на Ð°Ð´Ñ€ÐµÑ Ñлектронной почты"
#: js/share.js:174
msgid "Send"
-msgstr ""
+msgstr "Отправить"
#: js/share.js:178
msgid "Set expiration date"
-msgstr ""
+msgstr "УÑтановить Ñрок дейÑтвиÑ"
#: js/share.js:179
msgid "Expiration date"
-msgstr ""
+msgstr "Дата иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ"
#: js/share.js:211
msgid "Share via email:"
-msgstr ""
+msgstr "Сделать общедоÑтупным поÑредÑтвом email:"
#: js/share.js:213
msgid "No people found"
-msgstr ""
+msgstr "Ðе найдено людей"
#: js/share.js:251
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "РекурÑивный общий доÑтуп не разрешен"
#: js/share.js:287
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "СовмеÑтное иÑпользование в {объект} Ñ {пользователь}"
#: js/share.js:308
msgid "Unshare"
-msgstr ""
+msgstr "Отключить общий доÑтуп"
#: js/share.js:320
msgid "can edit"
-msgstr ""
+msgstr "возможно редактирование"
#: js/share.js:322
msgid "access control"
-msgstr ""
+msgstr "контроль доÑтупа"
#: js/share.js:325
msgid "create"
-msgstr ""
+msgstr "Ñоздать"
#: js/share.js:328
msgid "update"
-msgstr ""
+msgstr "обновить"
#: js/share.js:331
msgid "delete"
-msgstr ""
+msgstr "удалить"
#: js/share.js:334
msgid "share"
-msgstr ""
+msgstr "Ñделать общим"
#: js/share.js:368 js/share.js:564
msgid "Password protected"
-msgstr ""
+msgstr "Пароль защищен"
#: js/share.js:577
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Ошибка при отключении даты иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ"
#: js/share.js:589
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Ошибка при уÑтановке даты иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ"
#: js/share.js:604
msgid "Sending ..."
-msgstr ""
+msgstr "Отправка ..."
#: js/share.js:615
msgid "Email sent"
-msgstr ""
+msgstr "ПиÑьмо отправлено"
#: js/update.js:14
msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr ""
+msgstr "Обновление прошло неудачно. ПожалуйÑта, Ñообщите об Ñтом результате в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
#: js/update.js:18
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Обновление прошло уÑпешно. Ðемедленное перенаправление Ð’Ð°Ñ Ð½Ð° ownCloud."
#: lostpassword/controller.php:48
msgid "ownCloud password reset"
-msgstr ""
+msgstr "Переназначение паролÑ"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "ВоÑпользуйтеÑÑŒ Ñледующей ÑÑылкой Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Ð’Ñ‹ получите ÑÑылку Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾ Ñлектронной почте."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ email."
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Ðе удалоÑÑŒ выполнить запроÑ!"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
-msgstr ""
+msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr ""
+msgstr "Ваш пароль был переуÑтановлен"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
-msgstr ""
+msgstr "Ðа Ñтраницу входа"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr ""
+msgstr "Ðовый пароль"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
-msgstr ""
+msgstr "Переназначение паролÑ"
#: strings.php:5
msgid "Personal"
-msgstr ""
+msgstr "ПерÑональный"
#: strings.php:6
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
#: strings.php:7
msgid "Apps"
-msgstr ""
+msgstr "ПриложениÑ"
#: strings.php:8
msgid "Admin"
-msgstr ""
+msgstr "ÐдминиÑтратор"
#: strings.php:9
msgid "Help"
-msgstr ""
+msgstr "Помощь"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "ДоÑтуп запрещен"
#: templates/404.php:12
msgid "Cloud not found"
-msgstr ""
+msgstr "Облако не найдено"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr ""
+msgstr "Редактирование категорий"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr ""
+msgstr "Добавить"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
msgid "Security Warning"
-msgstr ""
+msgstr "Предупреждение ÑиÑтемы безопаÑноÑти"
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
@@ -489,125 +489,120 @@ msgstr ""
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Ðет доÑтупного защищенного генератора Ñлучайных чиÑел, пожалуйÑта, включите раÑширение PHP OpenSSL."
#: templates/installation.php:33
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Без защищенного генератора Ñлучайных чиÑел злоумышленник может Ñпрогнозировать пароль, ÑброÑить учетные данные и завладеть Вашим аккаунтом."
#: templates/installation.php:39
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ""
+msgstr "Ваша папка Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ и файлы возможно доÑтупны из интернета потому что файл .htaccess не работает."
#: templates/installation.php:40
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
"target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ как правильно наÑтроить Ваш Ñервер, пожалйÑта заглÑните в <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документацию</a>."
#: templates/installation.php:44
msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Создать <strong>admin account</strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr ""
+msgstr "РаÑширенный"
#: templates/installation.php:64
msgid "Data folder"
-msgstr ""
+msgstr "Папка данных"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
-msgstr ""
+msgstr "ÐаÑтроить базу данных"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
-msgstr ""
+msgstr "будет иÑпользоватьÑÑ"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
-msgstr ""
+msgstr "Пользователь базы данных"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
-msgstr ""
+msgstr "Пароль базы данных"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð±Ð°Ð·Ñ‹ данных"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
-msgstr ""
+msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑ‚ÑŒ базы данных"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
-msgstr ""
+msgstr "Сервер базы данных"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
-msgstr ""
+msgstr "Завершение наÑтройки"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "веб-ÑервиÑÑ‹ под Вашим контролем"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
-msgstr ""
+msgstr "Выйти"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "ÐвтоматичеÑкий вход в ÑиÑтему отклонен!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "ЕÑли Ð’Ñ‹ недавно не менÑли пароль, Ваш аккаунт может быть подвергнут опаÑноÑти!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "ПожалуйÑта, измените пароль, чтобы защитить ваш аккаунт еще раз."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
-msgstr ""
+msgstr "Забыли пароль?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
-msgstr ""
+msgstr "запомнить"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
-msgstr ""
+msgstr "Войти"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
-msgstr ""
+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
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Обновление ownCloud до верÑии %s, Ñто может занÑÑ‚ÑŒ некоторое времÑ."
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 32e4d26536..4e3eddace5 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
-# skoptev <skoptev@ukr.net>, 2012
-# Langaru <langaru@gmail.com>, 2013
+# <cdewqazxsqwe@gmail.com>, 2013.
+# <cdewqazxsqwe@gmail.com>, 2012.
+# <skoptev@ukr.net>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 01:55+0200\n"
-"PO-Revision-Date: 2013-04-25 23:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -82,19 +82,15 @@ msgstr "Ðеверный каталог."
msgid "Files"
msgstr "Файлы"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Сделать общим"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Удалить навÑегда"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Удалить"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Переименовать"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 540aefaac4..7c5c0870ed 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -3,14 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
+# Langaru <langaru@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,11 +22,11 @@ msgstr ""
#: app.php:349
msgid "Help"
-msgstr ""
+msgstr "Помощь"
#: app.php:362
msgid "Personal"
-msgstr ""
+msgstr "ПерÑональный"
#: app.php:373
msgid "Settings"
@@ -31,59 +34,59 @@ msgstr "ÐаÑтройки"
#: app.php:385
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
#: app.php:398
msgid "Apps"
-msgstr ""
+msgstr "ПриложениÑ"
#: app.php:406
msgid "Admin"
-msgstr ""
+msgstr "Ðдмин"
#: files.php:209
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Загрузка ZIP выключена."
#: files.php:210
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Файлы должны быть загружены один за другим."
#: files.php:211 files.php:244
msgid "Back to Files"
-msgstr ""
+msgstr "Обратно к файлам"
#: files.php:241
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Выбранные файлы Ñлишком велики Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ zip-архива."
#: helper.php:228
msgid "couldn't be determined"
-msgstr ""
+msgstr "не может быть определено"
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Приложение не запущено"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr ""
+msgstr "Ошибка аутентификации"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Маркер иÑтек. ПожалуйÑта, перезагрузите Ñтраницу."
#: search/provider/file.php:17 search/provider/file.php:35
msgid "Files"
-msgstr ""
+msgstr "Файлы"
#: search/provider/file.php:26 search/provider/file.php:33
msgid "Text"
-msgstr ""
+msgstr "ТекÑÑ‚"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "ИзображениÑ"
#: setup.php:34
msgid "Set an admin username."
@@ -113,129 +116,142 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
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:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "ПожалуйÑта проверте дважды <a href='%s'>гиды по уÑтановке</a>."
#: template.php:113
msgid "seconds ago"
-msgstr ""
+msgstr "Ñекунд назад"
#: template.php:114
msgid "1 minute ago"
-msgstr ""
+msgstr "1 минуту назад"
#: template.php:115
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d минут назад"
#: template.php:116
msgid "1 hour ago"
-msgstr ""
+msgstr "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
#: template.php:117
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "%d чаÑов назад"
#: template.php:118
msgid "today"
-msgstr ""
+msgstr "ÑегоднÑ"
#: template.php:119
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
#: template.php:120
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d дней назад"
#: template.php:121
msgid "last month"
-msgstr ""
+msgstr "в прошлом меÑÑце"
#: template.php:122
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "%d меÑÑцев назад"
#: template.php:123
msgid "last year"
-msgstr ""
+msgstr "в прошлом году"
#: template.php:124
msgid "years ago"
-msgstr ""
+msgstr "год назад"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s доÑтупно. Получите <a href=\"%s\">more information</a>"
+
+#: 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 ""
+msgstr "Ðе удалоÑÑŒ найти категорию \"%s\""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index bea5230516..09c56fb828 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2013.
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,70 +21,66 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ðевозможно загрузить ÑпиÑок из App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr ""
+msgstr "Ошибка авторизации"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
#: ajax/creategroup.php:10
msgid "Group already exists"
-msgstr ""
+msgstr "Группа уже ÑущеÑтвует"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr ""
+msgstr "Ðевозможно добавить группу"
#: ajax/enableapp.php:11
msgid "Could not enable app. "
-msgstr ""
+msgstr "Ðе удалоÑÑŒ запуÑтить приложение"
#: ajax/lostpassword.php:12
msgid "Email saved"
-msgstr ""
+msgstr "Email Ñохранен"
#: ajax/lostpassword.php:14
msgid "Invalid email"
-msgstr ""
+msgstr "Ðеверный email"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
-msgstr ""
+msgstr "Ðевозможно удалить группу"
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr ""
+msgstr "Ðевозможно удалить пользователÑ"
#: ajax/setlanguage.php:15
msgid "Language changed"
-msgstr ""
+msgstr "Язык изменен"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "Ðеверный запроÑ"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "ÐдминиÑтраторы не могут удалить Ñами ÑÐµÐ±Ñ Ð¸Ð· группы админиÑтраторов"
#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Ðевозможно добавить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² группу %s"
#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Ðевозможно удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
@@ -94,11 +92,11 @@ msgstr ""
#: js/apps.js:36 js/apps.js:76
msgid "Disable"
-msgstr ""
+msgstr "Отключить"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr ""
+msgstr "Включить"
#: js/apps.js:55
msgid "Please wait...."
@@ -106,7 +104,7 @@ msgstr ""
#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/apps.js:90
msgid "Updating...."
@@ -120,9 +118,9 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr ""
+msgstr "Сохранение"
#: js/users.js:43
msgid "deleted"
@@ -130,24 +128,24 @@ msgstr "удалено"
#: js/users.js:43
msgid "undo"
-msgstr ""
+msgstr "отменить дейÑтвие"
#: js/users.js:75
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
-msgstr ""
+msgstr "Группы"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
-msgstr ""
+msgstr "Группа Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
#: js/users.js:262
msgid "add group"
@@ -165,13 +163,13 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
-msgstr ""
+msgstr "__Ñзык_имÑ__"
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "Предупреждение ÑиÑтемы безопаÑноÑти"
#: templates/admin.php:18
msgid ""
@@ -180,7 +178,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 ""
+msgstr "Ваши каталоги данных и файлы, вероÑтно, доÑтупны из Интернета. Файл .htaccess, предоÑтавлÑемый ownCloud, не работает. Мы наÑтоÑтельно рекомендуем Вам наÑтроить вебÑервер таким образом, чтобы каталоги данных больше не были доÑтупны, или перемеÑтить их за пределы корневого каталога документов веб-Ñервера."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -190,12 +188,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 <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "ПожалуйÑта проверте дважды <a href='%s'>гиды по уÑтановке</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -316,19 +314,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
-msgstr ""
+msgstr "Подробнее"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
-msgstr ""
+msgstr "Меньше"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
-msgstr ""
+msgstr "ВерÑиÑ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,60 +334,60 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:11
msgid "Add your App"
-msgstr ""
+msgstr "Добавить Ваше приложение"
#: templates/apps.php:12
msgid "More Apps"
-msgstr ""
+msgstr "Больше приложений"
#: templates/apps.php:28
msgid "Select an App"
-msgstr ""
+msgstr "Выбрать приложение"
#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "ОбратитеÑÑŒ к Ñтранице приложений на apps.owncloud.com"
#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
#: templates/apps.php:38
msgid "Update"
-msgstr ""
+msgstr "Обновить"
#: templates/help.php:4
msgid "User Documentation"
-msgstr ""
+msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
#: templates/help.php:6
msgid "Administrator Documentation"
-msgstr ""
+msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора"
#: templates/help.php:9
msgid "Online Documentation"
-msgstr ""
+msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ online"
#: templates/help.php:11
msgid "Forum"
-msgstr ""
+msgstr "Форум"
#: templates/help.php:14
msgid "Bugtracker"
-msgstr ""
+msgstr "ОтÑлеживание ошибок"
#: templates/help.php:17
msgid "Commercial Support"
-msgstr ""
+msgstr "КоммерчеÑÐºÐ°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°"
#: templates/personal.php:8
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Ð’Ñ‹ иÑпользовали <strong>%s</strong> из возможных <strong>%s</strong>"
#: templates/personal.php:15
msgid "Get the apps to sync your files"
@@ -397,96 +395,108 @@ msgstr ""
#: templates/personal.php:26
msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Вновь показать помощника первоначальной наÑтройки"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
-msgstr ""
+msgstr "Пароль"
#: templates/personal.php:38
msgid "Your password was changed"
-msgstr ""
+msgstr "Ваш пароль был изменен"
#: templates/personal.php:39
msgid "Unable to change your password"
-msgstr ""
+msgstr "Ðевозможно изменить Ваш пароль"
#: templates/personal.php:40
msgid "Current password"
-msgstr ""
+msgstr "Текущий пароль"
#: templates/personal.php:42
msgid "New password"
-msgstr ""
+msgstr "Ðовый пароль"
#: templates/personal.php:44
msgid "Change password"
-msgstr ""
+msgstr "Изменить пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°"
+
+#: templates/personal.php:72
msgid "Your email address"
-msgstr ""
+msgstr "ÐÐ´Ñ€ÐµÑ Ð’Ð°ÑˆÐµÐ¹ Ñлектронной почты"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
-msgstr ""
+msgstr "Язык"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
-msgstr ""
+msgstr "Помогите перевеÑти"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "ИÑпользуйте Ñтот Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ownCloud в Вашем файловом менеджере"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
-msgstr ""
+msgstr "Создать"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
-msgstr ""
+msgstr "Хранилище по умолчанию"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
-msgstr ""
+msgstr "Ðеограниченный"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr ""
+msgstr "Другой"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
-msgstr ""
+msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
-msgstr ""
+msgstr "назначить новый пароль"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
-msgstr ""
+msgstr "По умолчанию"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 56ebb8d405..bd225017a6 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
+# Chamara Disanayake <chamara@nic.lk>, 2012.
+# <thanojar@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -146,7 +149,7 @@ msgstr "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š"
#: js/config.php:54
msgid "October"
-msgstr "ඔක්à¶à·à¶¶à¶»"
+msgstr "ඔක්à¶à·à¶¶à¶»à·Š"
#: js/config.php:55
msgid "November"
@@ -158,7 +161,7 @@ msgstr "දෙසà·à¶¸à·Šà¶¶à¶»à·Š"
#: js/js.js:286
msgid "Settings"
-msgstr "සිටුවම්"
+msgstr "à·ƒà·à¶šà·ƒà·”ම්"
#: js/js.js:718
msgid "seconds ago"
@@ -230,7 +233,7 @@ msgstr "ඔව්"
#: js/oc-dialogs.js:222
msgid "No"
-msgstr "එපà·"
+msgstr "නà·à·„à·"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -293,9 +296,9 @@ msgstr "යොමුවක් මඟින් බෙදà·à¶œà¶±à·Šà¶±"
msgid "Password protect"
msgstr "මුර පදයකින් ආරක්à·à·à¶šà¶»à¶±à·Šà¶±"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
-msgstr "මුර පදය"
+msgstr "මුර පදය "
#: js/share.js:173
msgid "Email link to person"
@@ -396,27 +399,24 @@ msgstr "ownCloud මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· ක
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "ඔබගේ මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· කිරීම සඳහ෠යොමුව විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ලෙන් ලà·à¶¶à·™à¶±à·” ඇà¶"
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "ඔබගේ මුරපදය ප්â€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· කිරීම සඳහ෠යොමුව විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ලෙන් ලà·à¶¶à·™à¶±à·” ඇà¶"
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "ඉල්ලීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’!"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "පරිà·à·“ලක නම"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -430,7 +430,7 @@ msgstr "පිවිසුම් පිටුවට"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr "නව මුරපදය"
+msgstr "නව මුර පදයක්"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
@@ -470,7 +470,7 @@ msgstr "ප්â€à¶»à¶·à·šà¶¯à¶ºà¶±à·Š සංස්කරණය"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "එකà¶à·” කරන්න"
+msgstr "එක් කරන්න"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -522,37 +522,37 @@ msgstr "දියුණු/උසස්"
msgid "Data folder"
msgstr "දà¶à·Šà¶ à·†à·à¶½à·Šà¶©à¶»à¶º"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "දà¶à·Šà¶ සමුදà·à¶º à·„à·à¶©à¶œà·à·ƒà·“ම"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "භà·à·€à·’à¶à· වනු ඇà¶"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à· භà·à·€à·’à¶à·à¶šà¶»à·”"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š මුරපදය"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š නම"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à· සේවà·à¶¯à·à¶ºà¶šà¶ºà·"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "ස්ථà·à¶´à¶±à¶º කිරීම අවසන් කරන්න"
@@ -560,42 +560,37 @@ msgstr "ස්ථà·à¶´à¶±à¶º කිරීම අවසන් කරන්න"
msgid "web services under your control"
msgstr "ඔබට පà·à¶½à¶±à¶º කළ à·„à·à¶šà·’ වෙබ් සේවà·à·€à¶±à·Š"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "නික්මීම"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "මුරපදය අමà¶à¶šà¶¯?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "මà¶à¶š à¶à¶¶à·à¶œà¶±à·Šà¶±"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "ප්â€à¶»à·€à·šà·à·€à¶±à·Šà¶±"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index eb144d24e4..3b5c8990fb 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
+# Chamara Disanayake <chamara@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +39,7 @@ msgstr "ගොනුවක් උඩුගචනොවුනි. නොහà·
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "දà·à·‚යක් නොමà·à¶. à·ƒà·à¶»à·Šà¶®à¶šà·€ ගොනුව උඩුගචකෙරුණි"
+msgstr "නිවà·à¶»à¶¯à·’ à·€ ගොනුව උඩුගචකෙරිනි"
#: ajax/upload.php:27
msgid ""
@@ -56,11 +58,11 @@ msgstr "උඩුගචකළ ගොනුවේ කොටසක් පමණ
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "ගොනුවක් උඩුගචනොවුණි"
+msgstr "කිසිදු ගොනවක් උඩුගචනොවිනි"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් අà¶à·”රුදහන්"
+msgstr "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් සොයà·à¶œà¶ නොහà·à¶š"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +80,15 @@ msgstr ""
msgid "Files"
msgstr "ගොනු"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "බෙද෠හද෠ගන්න"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "මක෠දමන්න"
+msgstr "මකන්න"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "නà·à·€à¶ නම් කරන්න"
@@ -221,7 +219,7 @@ msgstr ""
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "උඩුගචකරන්න"
+msgstr "උඩුගචකිරීම"
#: templates/admin.php:5
msgid "File handling"
@@ -289,7 +287,7 @@ msgstr "මෙහි කිසිවක් නොමà·à¶. යමක් උඩ
#: templates/index.php:76
msgid "Download"
-msgstr "බà·à¶±à·Šà¶±"
+msgstr "බà·à¶œà¶ කිරීම"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 4f64e1d7f5..3e1361874c 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 170cf71d03..13c3bd6a62 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "කරුණà·à¶šà¶» වලංගු Dropbox යෙදුම් යà¶
msgid "Error configuring Google Drive storage"
msgstr "Google Drive ගබඩà·à·€ වින්â€à¶ºà·à·ƒ කිරීමේ දà·à·à¶ºà¶šà·Š ඇà¶"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "භà·à·„ිර ගබඩà·à·€"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index e0e7c51d28..d4a15ed844 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "මුර පදය"
+msgstr "මුරපදය"
#: templates/authenticate.php:6
msgid "Submit"
@@ -37,7 +38,7 @@ msgstr "%s ඔබ සමඟ %s ගොනුව බෙදà·à·„දà·à¶œà¶à·Šà¶
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "බà·à¶±à·Šà¶±"
+msgstr "භà·à¶œà¶ කරන්න"
#: templates/public.php:40
msgid "No preview available for"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 8ba334fb5a..bc2af0ccec 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index e25ea0e116..eb2829745c 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +51,7 @@ msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "අනුවà·à¶¯"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 992b3a584f..c785afebd7 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012
+# dinusha <awantha14@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +69,7 @@ msgstr "යෙදුම සක්â€à¶»à·’ය කර නොමà·à¶"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶± දà·à·‚යක්"
+msgstr "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶±à¶º කිරීමේ දà·à·à¶ºà¶šà·Š"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,72 +115,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +237,19 @@ msgstr "පෙර අවුරුද්දේ"
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s යොදà·à¶œà¶ à·„à·à¶š. <a href=\"%s\">à¶à·€ විස්à¶à¶»</a> ලබà·à¶œà¶±à·Šà¶±"
+
+#: 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\""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 4f85fab02b..ecb6a7c40f 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
+# Chamara Disanayake <chamara@nic.lk>, 2012.
+# <thanojar@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶± දà·à·‚යක්"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -68,7 +67,7 @@ msgstr "භà·à·‚à·à·€ à·à·€à¶±à·ƒà·Š කිරීම"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "අවලංගු අයà·à¶¯à·”මක්"
+msgstr "අවලංගු අයදුම"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -98,7 +97,7 @@ msgstr "අක්â€à¶»à·’ය කරන්න"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "සක්â€à¶»à·’ය කරන්න"
+msgstr "ක්â€à¶»à·’යà¶à·Šà¶¸à¶š කරන්න"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +119,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "සුරà·à¶šà·™à¶¸à·’න් පවà¶à·“..."
@@ -136,18 +135,18 @@ msgstr "නිෂ්ප්â€à¶»à¶· කරන්න"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
-msgstr "කණ්ඩà·à¶ºà¶¸à·Š"
+msgstr "සමූහය"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "කà·à¶«à·Šà¶© පරිපà·à¶½à¶š"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "මක෠දමන්න"
+msgstr "මක෠දමනවà·"
#: js/users.js:262
msgid "add group"
@@ -165,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -255,7 +254,7 @@ msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "හුවමà·à¶»à·” කිරීම"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
@@ -267,7 +266,7 @@ msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "යොමු සලසන්න"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
@@ -275,19 +274,19 @@ msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "යළි යළිà¶à·Š හුවමà·à¶»à·”වට අවසර දෙමි"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "හුවමà·à¶»à·” කළ හුවමà·à¶»à·”වට අවසර දෙමි"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "ඕනෑම අයෙකු හ෠හුවමà·à¶»à·”වට අවසර දෙමි"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "à¶à¶¸ කණ්ඩà·à¶ºà¶¸à·š අයෙකු හ෠පමණක් හුවමà·à¶»à·”වට අවසර දෙමි"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +309,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "ලà¶à·”à·€"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "à·€à·à¶©à·’"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "අඩු"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +398,9 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
-msgstr "මුර පදය"
+msgstr "මුරපදය"
#: templates/personal.php:38
msgid "Your password was changed"
@@ -423,70 +422,82 @@ msgstr "නව මුරපදය"
msgid "Change password"
msgstr "මුරපදය වෙනස් කිරීම"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "ඔබගේ විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "මුරපද ප්â€à¶»à¶à·’ස්ථà·à¶´à¶±à¶º සඳහ෠විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·à¶½à·Š විස්à¶à¶» ලබ෠දෙන්න"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "භà·à·‚à·à·€"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "පරිවර්ථන සහය"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "à¶à¶±à¶±à·Šà¶±"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "වෙනà¶à·Š"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index b535f61782..3fdeae7d3a 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 267759adec..585de750f2 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index b8788c7a3b..858044fcb8 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index e1bece6b03..0e065e2795 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 6addb65af3..f99201a558 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 9348337814..1b12c17386 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index d363a222d4..725fce0126 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
index 1a9009a2ae..7157752d71 100644
--- a/l10n/sk/files_versions.po
+++ b/l10n/sk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 50d96efd77..72fd060bdd 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 1c2339b2dc..d9b345699c 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 289b258772..37edfc8d9f 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bac1aabe45..6ec59a28f0 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,13 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# georg <georg007@gmail.com>, 2013.
+# <intense.feel@gmail.com>, 2011, 2012.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# <martin.babik@gmail.com>, 2012.
+# <mehturt@gmail.com>, 2013.
+# Roman Priesol <roman@priesol.net>, 2012.
+# <zatroch.martin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -175,7 +181,7 @@ msgstr "pred {minutes} minútami"
#: js/js.js:721
msgid "1 hour ago"
-msgstr "Pred 1 hodinou"
+msgstr "Pred 1 hodinou."
#: js/js.js:722
msgid "{hours} hours ago"
@@ -294,7 +300,7 @@ msgstr "Zdieľať cez odkaz"
msgid "Password protect"
msgstr "Chrániť heslom"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Heslo"
@@ -397,27 +403,24 @@ msgstr "Obnovenie hesla pre ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Odkaz na obnovenie hesla bol odoslaný na VaÅ¡u emailovú adresu.<br>Ak ho v krátkej dobe neobdržÃte, skontrolujte si Váš kôš a prieÄinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Požiadavka zlyhala.<br>Uistili ste sa, že VaÅ¡e použÃvateľské meno a email sú správne?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Odkaz pre obnovenie hesla obdržÃte e-mailom."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Obnovovacà email bol odoslaný."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Požiadavka zlyhala!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Meno použÃvateľa"
+msgstr "Prihlasovacie meno"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Požiadať o obnovenie"
@@ -451,7 +454,7 @@ msgstr "Aplikácie"
#: strings.php:8
msgid "Admin"
-msgstr "Administrátor"
+msgstr "Administrácia"
#: strings.php:9
msgid "Help"
@@ -467,7 +470,7 @@ msgstr "Nenájdené"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Upraviť kategórie"
+msgstr "Úprava kategóriÃ"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -523,80 +526,75 @@ msgstr "RozÅ¡Ãrené"
msgid "Data folder"
msgstr "PrieÄinok dát"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Nastaviť databázu"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "bude použité"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Hostiteľ databázy"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Heslo databázy"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Meno databázy"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tabuľkový priestor databázy"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Server databázy"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "DokonÄiÅ¥ inÅ¡taláciu"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "webové služby pod Vašou kontrolou"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "webové služby pod vašou kontrolou"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Odhlásiť"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatické prihlásenie bolo zamietnuté!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "V nedávnej dobe ste nezmenili svoje heslo, Váš úÄet môže byÅ¥ kompromitovaný."
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "ProsÃm, zmeňte svoje heslo pre opätovné zabezpeÄenie Vášho úÄtu"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Zabudli ste heslo?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "zapamätať"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Prihlásiť sa"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "AlternatÃvne prihlasovanie"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index f482515f73..e5dac9f965 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# georg <georg007@gmail.com>, 2013.
+# <intense.feel@gmail.com>, 2012.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# <martin.babik@gmail.com>, 2012.
+# Martin Zatroch <zatroch.martin@gmail.com>, 2013.
+# Roman Priesol <roman@priesol.net>, 2012.
+# <zatroch.martin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -48,19 +55,19 @@ msgstr "Nahraný súbor predÄil konfiguraÄnú direktÃvu upload_max_filesize
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Ukladaný súbor prekraÄuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
+msgstr "Nahrávaný súbor presiahol MAX_FILE_SIZE direktÃvu, ktorá bola Å¡pecifikovaná v HTML formulári"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Ukladaný súbor sa nahral len ÄiastoÄne"
+msgstr "Nahrávaný súbor bol iba ÄiastoÄne nahraný"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Žiadny súbor nebol uložený"
+msgstr "Žiaden súbor nebol nahraný"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Chýba doÄasný prieÄinok"
+msgstr "Chýbajúci doÄasný prieÄinok"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +85,21 @@ msgstr "Neplatný prieÄinok"
msgid "Files"
msgstr "Súbory"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Zdieľať"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Zmazať trvalo"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "Zmazať"
+msgstr "Odstrániť"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Premenovať"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "Prebieha"
+msgstr "Čaká sa"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -164,7 +167,7 @@ msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, mô
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nedá sa odoslaÅ¥ Váš súbor, pretože je to prieÄinok, alebo je jeho veľkosÅ¥ 0 bajtov"
+msgstr "Nemôžem nahraÅ¥ súbor lebo je to prieÄinok alebo má 0 bajtov."
#: js/files.js:272
msgid "Not enough space available"
@@ -193,7 +196,7 @@ msgstr "Chyba"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "Názov"
+msgstr "Meno"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -257,7 +260,7 @@ msgstr "Uložiť"
#: templates/index.php:7
msgid "New"
-msgstr "Nová"
+msgstr "Nový"
#: templates/index.php:10
msgid "Text file"
@@ -289,15 +292,15 @@ msgstr "Žiadny súbor. Nahrajte nieÄo!"
#: templates/index.php:76
msgid "Download"
-msgstr "SÅ¥ahovanie"
+msgstr "Stiahnuť"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Zrušiť zdieľanie"
+msgstr "Nezdielať"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Nahrávanie je prÃliÅ¡ veľké"
+msgstr "Odosielaný súbor je prÃliÅ¡ veľký"
#: templates/index.php:110
msgid ""
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 3c5194e64c..69c0359cc1 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# georg <georg007@gmail.com>, 2013.
+# <intense.feel@gmail.com>, 2012.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +38,4 @@ msgstr "Nešifrovať uvedené typy súborov"
#: templates/settings.php:12
msgid "None"
-msgstr "Žiadny"
+msgstr "Žiadne"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index fdd045ce13..3603bda557 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# <intense.feel@gmail.com>, 2012.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# <martin.babik@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 19:00+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,26 +40,19 @@ msgstr "Zadajte platný kÄ¾ÃºÄ aplikácie a heslo Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Chyba pri konfigurácii úložiska Google drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Upozornenie:</b> \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Upozornenie:</b> Podpora FTP v PHP nie je povolená alebo nainštalovaná. Nie je možné pripojenie oddielov FTP. Požiadajte administrátora systému, nech ho nainštaluje."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Varovanie:</b> nie je nainÅ¡talovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, Äi GoogleDrive. ProsÃm požiadajte svojho administrátora systému, nech ju nainÅ¡taluje."
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Externé úložisko"
@@ -105,7 +100,7 @@ msgstr "PoužÃvatelia"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr "Zmazať"
+msgstr "Odstrániť"
#: templates/settings.php:129
msgid "Enable User External Storage"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 4dbc07b1ac..d792bd55d1 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <intense.feel@gmail.com>, 2012.
+# <martin.babik@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +39,7 @@ msgstr "%s zdieľa s vami súbor %s"
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "SÅ¥ahovanie"
+msgstr "Stiahnuť"
#: templates/public.php:40
msgid "No preview available for"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e46d3c3aa5..4c53d28f01 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# georg <georg007@gmail.com>, 2013.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -45,7 +47,7 @@ msgstr "Zmazať trvalo"
#: js/trash.js:174 templates/index.php:17
msgid "Name"
-msgstr "Názov"
+msgstr "Meno"
#: js/trash.js:175 templates/index.php:27
msgid "Deleted"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index e7044592ad..6bb0cb836c 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# georg <georg007@gmail.com>, 2013.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# <martin.babik@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 2db5eafdca..b99a339307 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
+# martinb <martin.babik@gmail.com>, 2012
+# Roman Priesol <roman@priesol.net>, 2012
+# martin <zatroch.martin@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +117,72 @@ msgstr "V názve databázy %s nemôžete použÃvaÅ¥ bodky"
msgid "%s set the database host."
msgstr "Zadajte názov poÄÃtaÄa s databázou %s."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PoužÃvateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "MusÃte zadaÅ¥ jestvujúci úÄet alebo administrátora."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "PoužÃvateľské meno a/alebo heslo pre Oracle databázu je neplatné"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "PoužÃvateľské meno a/alebo heslo pre MySQL databázu je neplatné"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Chyba DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Podozrivý prÃkaz bol: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "PoužÃvateľ '%s'@'localhost' už v MySQL existuje."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "ZahodiÅ¥ použÃvateľa z MySQL."
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "PoužÃvateľ '%s'@'%%' už v MySQL existuje"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "ZahodiÅ¥ použÃvateľa z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Podozrivý prÃkaz bol: \"%s\", meno: %s, heslo: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "PoužÃvateľské meno, alebo heslo MS SQL nie je platné: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnú prÃruÄku</a>."
@@ -189,7 +193,7 @@ msgstr "pred sekundami"
#: template.php:114
msgid "1 minute ago"
-msgstr "pred minútou"
+msgstr "pred 1 minútou"
#: template.php:115
#, php-format
@@ -235,6 +239,19 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "pred rokmi"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s je dostupné. ZÃskaÅ¥ <a href=\"%s\">pre viac informáciÃ</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "aktuálny"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "sledovanie aktualizácià je vypnuté"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index adbef6c0f0..84eb780da7 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,14 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# <intense.feel@gmail.com>, 2011, 2012.
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# <martin.babik@gmail.com>, 2012.
+# Roman Priesol <roman@priesol.net>, 2012.
+# <typhoon@zoznam.sk>, 2012.
+# <zatroch.martin@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 18:50+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +27,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nie je možné nahrať zoznam z App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Chyba autentifikácie"
+msgstr "Chyba pri autentifikácii"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Vaše zobrazované meno bolo zmenené."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Nemožno zmeniť zobrazované meno"
@@ -99,7 +100,7 @@ msgstr "Zakázať"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Zapnúť"
+msgstr "Povoliť"
#: js/apps.js:55
msgid "Please wait...."
@@ -121,7 +122,7 @@ msgstr "chyba pri aktualizácii aplikácie"
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Ukladám..."
@@ -137,18 +138,18 @@ msgstr "vrátiť"
msgid "Unable to remove user"
msgstr "Nemožno odobraÅ¥ použÃvateľa"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "Zmazať"
+msgstr "Odstrániť"
#: js/users.js:262
msgid "add group"
@@ -166,7 +167,7 @@ msgstr "Chyba pri vytváranà použÃvateľa"
msgid "A valid password must be provided"
msgstr "MusÃte zadaÅ¥ platné heslo"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Slovensky"
@@ -317,19 +318,19 @@ msgstr "Záznam"
msgid "Log level"
msgstr "Úroveň záznamu"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Viac"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "ZÃskaÅ¥ aplikácie na synchronizáciu VaÅ¡ich súborov"
msgid "Show First Run Wizard again"
msgstr "Znovu zobraziÅ¥ sprievodcu prvým spustenÃm"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Heslo"
@@ -424,70 +425,82 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Zobrazované meno"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Vaše zobrazované meno bolo zmenené"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Nemožno zmeniť Vaše zobrazované meno"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Zmeniť zobrazované meno"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Vaša emailová adresa"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Prihlasovacie meno"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Vytvoriť"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Predvolené úložisko"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Nelimitované"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Iné"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Úložisko"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "zmeniť zobrazované meno"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "nastaviť nové heslo"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 5cbcb94242..dcfe6e11b1 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# Roman Priesol <roman@priesol.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c420c56eaf..3d0bd6ff5d 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -4,12 +4,17 @@
#
# Translators:
# mateju <>, 2013
+# mateju <>, 2012
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# urossolar <urossolar@hotmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 19:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -175,7 +180,7 @@ msgstr "pred {minutes} minutami"
#: js/js.js:721
msgid "1 hour ago"
-msgstr "Pred 1 uro"
+msgstr "pred 1 uro"
#: js/js.js:722
msgid "{hours} hours ago"
@@ -294,7 +299,7 @@ msgstr "OmogoÄi souporabo preko povezave"
msgid "Password protect"
msgstr "ZaÅ¡Äiti z geslom"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Geslo"
@@ -332,7 +337,7 @@ msgstr "V souporabi v {item} z {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "PrekliÄi souporabo"
+msgstr "Odstrani souporabo"
#: js/share.js:320
msgid "can edit"
@@ -397,27 +402,24 @@ msgstr "Ponastavitev gesla za oblak ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Za ponastavitev gesla uporabite povezavo: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporoÄila ne prejmete v doglednem Äasu, preverite tudi mape vsiljene poÅ¡te.<br>ÄŒe ne bo niti tam, stopite v stik s skrbnikom."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "SporoÄilo z navodili za ponastavitev gesla je poslana na vaÅ¡ elektronski naslov."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Zahteva je spodletela!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Uporabniško ime"
+msgstr "Uporabniško Ime"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Zahtevaj ponovno nastavitev"
@@ -561,42 +563,37 @@ msgstr "KonÄaj namestitev"
msgid "web services under your control"
msgstr "spletne storitve pod vašim nadzorom"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Odjava"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Samodejno prijavljanje je zavrnjeno!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "V primeru, da gesla za dostop že nekaj Äasa niste spremenili, je raÄun lahko ogrožen!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Spremenite geslo za izboljÅ¡anje zaÅ¡Äite raÄuna."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ali ste pozabili geslo?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "zapomni si"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Prijava"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Druge prijavne možnosti"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 3cd5da7a41..1c0597e776 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mateju <>, 2012
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# Peter Peroša <peter.perosa@gmail.com>, 2012
+# urossolar <urossolar@hotmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
+"PO-Revision-Date: 2013-04-19 20:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -33,11 +38,11 @@ msgstr "Ni mogoÄe preimenovati datoteke"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr "Ni poslane datoteke. Neznana napaka."
+msgstr "Ni poslane nobene datoteke. Neznana napaka."
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Datoteka je uspešno naložena."
+msgstr "Datoteka je uspešno poslana."
#: ajax/upload.php:27
msgid ""
@@ -52,11 +57,11 @@ msgstr "Poslana datoteka presega velikost, ki jo doloÄa parameter najveÄje dov
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Poslan je le del datoteke."
+msgstr "Datoteka je le delno naložena"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Ni poslane datoteke"
+msgstr "Nobena datoteka ni bila naložena"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,19 +83,15 @@ msgstr "Neveljavna mapa."
msgid "Files"
msgstr "Datoteke"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Souporaba"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
-msgstr "IzbriÅ¡i dokonÄno"
+msgstr "Izbriši trajno"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Izbriši"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Preimenuj"
@@ -164,7 +165,7 @@ msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, Äe je datote
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "PoÅ¡iljanja ni mogoÄe izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
+msgstr "PoÅ¡iljanje ni mogoÄe, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov."
#: js/files.js:272
msgid "Not enough space available"
@@ -257,7 +258,7 @@ msgstr "Shrani"
#: templates/index.php:7
msgid "New"
-msgstr "Novo"
+msgstr "Nova"
#: templates/index.php:10
msgid "Text file"
@@ -293,7 +294,7 @@ msgstr "Prejmi"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "PrekliÄi souporabo"
+msgstr "Odstrani iz souporabe"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 716091a2f0..32f913f262 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <>, 2012.
+# Matej UrbanÄiÄ <>, 2013.
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 9b47116228..d7930595bc 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mateju <>, 2013
+# <>, 2012.
+# Matej UrbanÄiÄ <>, 2013.
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:20+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,25 +40,18 @@ msgstr "Vpisati je treba veljaven kljuÄ programa in kodo za Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Napaka nastavljanja shrambe Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Opozorilo:</b> paket \"smbclient\" ni nameÅ¡Äen. Priklapljanje pogonov CIFS/SMB ne bo mogoÄe."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr "<b>Opozorilo:</b> podpora FTP v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje pogonov FTP zato ne bo mogoÄe."
-
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>Opozorilo:</b> podpora za Curl v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje toÄke ownCloud / WebDAV ali GoogleDrive zato ne bo mogoÄe. Zahtevane pakete je treba pred uporabo namestiti."
+msgstr "<b>Opozorilo:</b> podpora FTP v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje pogonov FTP zato ni mogoÄe."
#: templates/settings.php:3
msgid "External Storage"
@@ -109,7 +104,7 @@ msgstr "Izbriši"
#: templates/settings.php:129
msgid "Enable User External Storage"
-msgstr "OmogoÄi zunanjo uporabniÅ¡ko podatkovno shrambo"
+msgstr "OmogoÄi uporabniÅ¡ko zunanjo podatkovno shrambo"
#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index e1d7adc791..cce3754070 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <>, 2012.
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 8900ee66e4..1c88a1cf01 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mateju <>, 2013
+# mateju <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 17:02+0000\n"
+"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 72f744258c..154d0ce088 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <>, 2012.
+# Matej UrbanÄiÄ <>, 2013.
+# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 636c2a101d..bc51adf8f3 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mateju <>, 2012
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +70,7 @@ msgstr "Program ni omogoÄen"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr "Napaka pri overjanju"
+msgstr "Napaka overitve"
#: json.php:51
msgid "Token expired. Please reload page."
@@ -113,72 +116,72 @@ msgstr "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik."
msgid "%s set the database host."
msgstr "%s - vnos gostitelja podatkovne zbirke."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Prijaviti se je treba v obstojeÄi ali pa skrbniÅ¡ki raÄun."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Napaka podatkovne zbirke: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "NapaÄni ukaz je: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "NapaÄni ukaz je: \"%s\", ime: %s, geslo: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Spletni stražnik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Preverite <a href='%s'>navodila namestitve</a>."
@@ -220,7 +223,7 @@ msgstr "pred %d dnevi"
#: template.php:121
msgid "last month"
-msgstr "zadnji mesec"
+msgstr "prejšnji mesec"
#: template.php:122
#, php-format
@@ -233,7 +236,20 @@ msgstr "lansko leto"
#: template.php:124
msgid "years ago"
-msgstr "let nazaj"
+msgstr "pred nekaj leti"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s je na voljo. <a href=\"%s\">VeÄ podrobnosti.</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "posodobljeno"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "preverjanje za posodobitve je onemogoÄeno"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 65640901d2..957fabe747 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -3,14 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# mateju <>, 2013
+# <>, 2013.
+# <>, 2012.
+# Matej UrbanÄiÄ <>, 2013.
+# <peter.perosa@gmail.com>, 2012.
+# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
+# <urossolar@hotmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,18 +25,14 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr "Ni mogoÄe naložiti seznama iz programskega srediÅ¡Äa"
+msgstr "Ni mogoÄe naložiti seznama iz srediÅ¡Äa App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Napaka med overjanjem"
+msgstr "Napaka overitve"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "Prikazano ime je bilo spremenjeno."
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Prikazanega imena ni mogoÄe spremeniti."
@@ -121,7 +122,7 @@ msgstr "Prišlo je do napake med posodabljanjem programa."
msgid "Updated"
msgstr "Posodobljeno"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
@@ -137,16 +138,16 @@ msgstr "razveljavi"
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoÄe odstraniti"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Izbriši"
@@ -166,7 +167,7 @@ msgstr "Napaka ustvarjanja uporabnika"
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "SlovenÅ¡Äina"
@@ -317,19 +318,19 @@ msgstr "Dnevnik"
msgid "Log level"
msgstr "Raven beleženja"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "VeÄ"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "RazliÄica"
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +401,7 @@ msgstr "Pridobi programe za usklajevanje datotek"
msgid "Show First Run Wizard again"
msgstr "Zaženi Äarovnika prvega zagona"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Geslo"
@@ -424,70 +425,82 @@ msgstr "Novo geslo"
msgid "Change password"
msgstr "Spremeni geslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Prikazano ime"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Elektronski naslov"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Prikazano ime je spremenjeno."
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Prikazanega imena ni mogoÄe spremeniti."
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Spremeni prikazano ime"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Elektronska pošta"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Osebni elektronski naslov"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "VpiÅ¡ite osebni elektronski naslov in s tem omogoÄite obnovitev gesla"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Sodelujte pri prevajanju"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Prijavno ime"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Ustvari"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Privzeta shramba"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Neomejeno"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Shramba"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "spremeni prikazano ime"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "nastavi novo geslo"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e5fd3aba3e..d291effd85 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <>, 2012.
+# Matej UrbanÄiÄ <>, 2013.
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 71dbe13828..1179d65ec7 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Odeen <rapid_odeen@zoho.com>, 2013
+# <rapid_odeen@zoho.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -159,7 +159,7 @@ msgstr "Dhjetor"
#: js/js.js:286
msgid "Settings"
-msgstr "Parametra"
+msgstr "Parametrat"
#: js/js.js:718
msgid "seconds ago"
@@ -294,7 +294,7 @@ msgstr "Nda me lidhje"
msgid "Password protect"
msgstr "Mbro me kod"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Kodi"
@@ -397,27 +397,24 @@ msgstr "Rivendosja e kodit të ownCloud-it"
msgid "Use the following link to reset your password: {link}"
msgstr "Përdorni lidhjen në vijim për të rivendosur kodin: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal."
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?"
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Emaili i rivendosjes u dërgua."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Kërkesa dështoi!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Përdoruesi"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Bëj kërkesë për rivendosjen"
@@ -523,37 +520,37 @@ msgstr "Të përparuara"
msgid "Data folder"
msgstr "Emri i dosjes"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfiguro database-in"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "do të përdoret"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Përdoruesi i database-it"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Kodi i database-it"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Emri i database-it"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Tablespace-i i database-it"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Pozicioni (host) i database-it"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Mbaro setup-in"
@@ -561,42 +558,37 @@ msgstr "Mbaro setup-in"
msgid "web services under your control"
msgstr "shërbime web nën kontrollin tënd"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Dalje"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Hyrja automatike u refuzua!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar."
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Ju lutemi, ndryshoni kodin për ta siguruar përsëri llogarinë tuaj."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ke humbur kodin?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "kujto"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Hyrje"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Hyrje alternative"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 5a921c586a..3915e15310 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rapid_odeen@zoho.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr "Dosje e pavlefshme."
msgid "Files"
msgstr "Skedarët"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Nda"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Elimino përfundimisht"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Elimino"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Riemërto"
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index bccdde2ed2..7dbf902707 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 7e3f1dba76..bb92141f3e 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 2ce9c10dbb..9b729426c3 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rapid_odeen@zoho.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index afda019715..a2e6c8176a 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rapid_odeen@zoho.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 4520df0880..a2ce9ffe2b 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 15687a76d3..9629d1e79c 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +28,7 @@ msgstr "Personale"
#: app.php:373
msgid "Settings"
-msgstr "Parametra"
+msgstr "Parametrat"
#: app.php:385
msgid "Users"
@@ -113,72 +114,72 @@ msgstr "%s nuk mund të përdorni pikat tek emri i database-it"
msgid "%s set the database host."
msgstr "%s caktoni pozicionin (host) e database-it."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Veprim i gabuar i DB-it: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Komanda e gabuar ishte: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Eliminoni këtë përdorues nga MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Eliminoni këtë përdorues nga MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
@@ -235,6 +236,19 @@ msgstr "vitin e shkuar"
msgid "years ago"
msgstr "vite më parë"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s është i disponueshëm. <a href=\"%s\">Informohuni këtu</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "i azhornuar"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "kontrollimi i azhurnimeve është i çaktivizuar"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 7ad44cb2f8..0ea938feaf 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rapid_odeen@zoho.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 22:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Veprim i gabuar gjatë vërtetimit të identitetit"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +133,16 @@ msgstr "anulo"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Elimino"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +313,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Kodi"
@@ -423,70 +420,82 @@ msgstr "Kodi i ri"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
-msgstr "Email-i"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index d743361000..ff91215d0a 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index c71d786985..e976000343 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ivan Petrović <ivan@ipplusstudio.com>, 2012-2013.
+# <marko@evizo.com>, 2012.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -158,7 +161,7 @@ msgstr "Децембар"
#: js/js.js:286
msgid "Settings"
-msgstr "ПоÑтавке"
+msgstr "Подешавања"
#: js/js.js:718
msgid "seconds ago"
@@ -259,7 +262,7 @@ msgstr ""
#: js/share.js:90
msgid "Share"
-msgstr "Дели"
+msgstr "Дељење"
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
@@ -293,7 +296,7 @@ msgstr "Подели линк"
msgid "Password protect"
msgstr "Заштићено лозинком"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Лозинка"
@@ -331,7 +334,7 @@ msgstr "Подељено унутар {item} Ñа {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "Укини дељење"
+msgstr "Ðе дели"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +399,24 @@ msgstr "Поништавање лозинке за ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "Овом везом реÑетујте Ñвоју лозинку: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Добићете везу за реÑетовање лозинке путем е-поште."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "КориÑничко име"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Захтевај реÑетовање"
@@ -438,7 +438,7 @@ msgstr "РеÑетуј лозинку"
#: strings.php:5
msgid "Personal"
-msgstr "Лично"
+msgstr "Лична"
#: strings.php:6
msgid "Users"
@@ -446,11 +446,11 @@ msgstr "КориÑници"
#: strings.php:7
msgid "Apps"
-msgstr "Ðпликације"
+msgstr "Програми"
#: strings.php:8
msgid "Admin"
-msgstr "ÐдминиÑтратор"
+msgstr "ÐдниниÑтрација"
#: strings.php:9
msgid "Help"
@@ -522,37 +522,37 @@ msgstr "Ðапредно"
msgid "Data folder"
msgstr "Фацикла података"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Подешавање базе"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "ће бити коришћен"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "КориÑник базе"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Лозинка базе"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Име базе"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Радни проÑтор базе података"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Домаћин базе"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Заврши подешавање"
@@ -560,42 +560,37 @@ msgstr "Заврши подешавање"
msgid "web services under your control"
msgstr "веб ÑервиÑи под контролом"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Одјава"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "ÐутоматÑка пријава је одбијена!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Ðко уÑкоро не промените лозинку ваш налог може бити компромитован!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Промените лозинку да биÑте обезбедили налог."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Изгубили Ñте лозинку?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "упамти"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Пријава"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 9a0ef172ee..18eacafc8b 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ivan Petrović <ivan@ipplusstudio.com>, 2012.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
+# <theranchcowboy@gmail.com>, 2013.
+# <theranchcowboy@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +82,15 @@ msgstr "неиÑправна фаÑцикла."
msgid "Files"
msgstr "Датотеке"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Дели"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Обриши за Ñтално"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Обриши"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Преименуј"
@@ -193,7 +193,7 @@ msgstr "Грешка"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "Име"
+msgstr "Ðазив"
#: js/files.js:873 templates/index.php:81
msgid "Size"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 22a63dce30..2eae48fdc6 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <marko@evizo.com>, 2012.
+# <theranchcowboy@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 83105656cf..476522e9fb 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 60f8cfce70..8c455cac47 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -45,4 +45,4 @@ msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "веб ÑервиÑи под контролом"
+msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index a412f3ccd3..69d8ab3bf2 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <theranchcowboy@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 2c8b97da34..b878bee563 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <theranchcowboy@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index f2b8abefc5..95f58fe7f5 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Ivan Petrović <ivan@ipplusstudio.com>, 2012-2013
+# Rancher <theranchcowboy@gmail.com>, 2013
+# Rancher <theranchcowboy@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +116,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб Ñервер тренутно не подржава Ñинхронизацију датотека јер Ñе чини да је WebDAV Ñучеље неиÑправно."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Погледајте <a href='%s'>водиче за инÑталацију</a>."
@@ -198,7 +201,7 @@ msgstr "пре %d минута"
#: template.php:116
msgid "1 hour ago"
-msgstr "Пре једног Ñата"
+msgstr "пре 1 Ñат"
#: template.php:117
#, php-format
@@ -235,6 +238,19 @@ msgstr "прошле године"
msgid "years ago"
msgstr "година раније"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s је доÑтупна. Погледајте <a href=\"%s\">више информација</a>."
+
+#: 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\""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 405497d2c3..4faad27c2f 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <marko@evizo.com>, 2012.
+# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
+# <theranchcowboy@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Грешка приликом учитавања ÑпиÑка из Складишта Програма"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Грешка при провери идентитета"
+msgstr "Грешка при аутентификацији"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Ðе могу да променим име за приказ"
@@ -98,7 +97,7 @@ msgstr "ИÑкључи"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "Омогући"
+msgstr "Укључи"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +119,7 @@ msgstr "Грешка при ажурирању апликације"
msgid "Updated"
msgstr "Ðжурирано"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Чување у току..."
@@ -136,16 +135,16 @@ msgstr "опозови"
msgid "Unable to remove user"
msgstr "Ðе могу да уклоним кориÑника"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Групе"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Обриши"
@@ -165,7 +164,7 @@ msgstr "Грешка при прављењу кориÑника"
msgid "A valid password must be provided"
msgstr "Морате унети иÑправну лозинку"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -316,19 +315,19 @@ msgstr "Бележење"
msgid "Log level"
msgstr "Ðиво бележења"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Више"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Мање"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr "Преузмите апликације ради Ñинхронизов
msgid "Show First Run Wizard again"
msgstr "Поново прикажи чаробњак за прво покретање"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Лозинка"
@@ -423,70 +422,82 @@ msgstr "Ðова лозинка"
msgid "Change password"
msgstr "Измени лозинку"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Име за приказ"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Ваше име за приказ је промењено"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Ðе могу да променим ваше име за приказ"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Промени име за приказ"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Ваша адреÑа е-поште"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Ун"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Језик"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr " Помозите у превођењу"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "КориÑтите ову адреÑу да Ñе повежете Ñа ownCloud-ом у управљачу датотекама"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "КориÑничко име"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Ðаправи"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Подразумевано Ñкладиште"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ðеограничено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Друго"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Складиште"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "промени име за приказ"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "поÑтави нову лозинку"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index a87033c8c5..5ab18046b0 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <theranchcowboy@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 555da08b9e..e3b9468ad2 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Lozinka"
@@ -396,27 +397,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "KorisniÄko ime"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Zahtevaj resetovanje"
@@ -438,7 +436,7 @@ msgstr "Resetuj lozinku"
#: strings.php:5
msgid "Personal"
-msgstr "LiÄno"
+msgstr "LiÄna"
#: strings.php:6
msgid "Users"
@@ -522,37 +520,37 @@ msgstr "Napredno"
msgid "Data folder"
msgstr "Facikla podataka"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Podešavanje baze"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "će biti korišćen"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Korisnik baze"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Lozinka baze"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Ime baze"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Domaćin baze"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Završi podešavanje"
@@ -560,42 +558,37 @@ msgstr "Završi podešavanje"
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Odjava"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "upamti"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index d7489c9819..20a4cf13bc 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr ""
msgid "Files"
msgstr "Fajlovi"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Obriši"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 457c34823a..9eb93b9f93 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 1c91965f29..fbfb36951c 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index a36fa20fae..778a78eb8c 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Lozinka"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Pošalji"
+msgstr ""
#: templates/public.php:10
#, php-format
@@ -37,7 +37,7 @@ msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
-msgstr "Preuzmi"
+msgstr ""
#: templates/public.php:40
msgid "No preview available for"
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 717696ba37..5743501ec1 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 2f888ae0aa..7e54c05a93 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index d2b1782668..2cc4b44f0f 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "Korisnici"
#: app.php:398
msgid "Apps"
-msgstr "Programi"
+msgstr ""
#: app.php:406
msgid "Admin"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index dbfe43bcfc..6b6e552803 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Slobodan Terzić <githzerai06@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Greška pri autentifikaciji"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +133,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Obriši"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +313,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Lozinka"
@@ -423,70 +420,82 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmeni lozinku"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Napravi"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 39eaebf0ac..19f25b81a0 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr ""
#: templates/settings.php:46
msgid "Password"
-msgstr "Lozinka"
+msgstr ""
#: templates/settings.php:49
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 800698a5ad..a176c33235 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André <lokal_profil@hotmail.com>, 2013.
+# Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
+# <hakan.thn@gmail.com>, 2011.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
+# <magnus@linux.com>, 2012.
+# <revoltism@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +300,7 @@ msgstr "Delad med länk"
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Lösenord"
@@ -396,27 +403,24 @@ msgstr "ownCloud lösenordsåterställning"
msgid "Use the following link to reset your password: {link}"
msgstr "Använd följande länk för att återställa lösenordet: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Du får en länk att återställa ditt lösenord via e-post."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Återställ skickad e-post."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Begäran misslyckades!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "Användarnamn"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Begär återställning"
@@ -466,7 +470,7 @@ msgstr "Hittade inget moln"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Editera kategorier"
+msgstr "Redigera kategorier"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -516,43 +520,43 @@ msgstr "Skapa ett <strong>administratörskonto</strong>"
#: templates/installation.php:62
msgid "Advanced"
-msgstr "Avancerad"
+msgstr "Avancerat"
#: templates/installation.php:64
msgid "Data folder"
msgstr "Datamapp"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Konfigurera databasen"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "kommer att användas"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "Databasanvändare"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Lösenord till databasen"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Databasnamn"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Databas tabellutrymme"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Databasserver"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Avsluta installation"
@@ -560,42 +564,37 @@ msgstr "Avsluta installation"
msgid "web services under your control"
msgstr "webbtjänster under din kontroll"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Logga ut"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatisk inloggning inte tillåten!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Ändra genast lösenord för att säkra ditt konto."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Glömt ditt lösenord?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "kom ihåg"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Logga in"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Alternativa inloggningar"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index a36c0ffa80..f18dad2214 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André <lokal_profil@hotmail.com>, 2013.
+# Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
+# <magnus@linux.com>, 2012.
+# <revoltism@gmail.com>, 2011, 2012.
+# <tscooter@hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +44,7 @@ msgstr "Ingen fil uppladdad. Okänt fel"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Inga fel uppstod. Filen laddades upp utan problem."
+msgstr "Inga fel uppstod. Filen laddades upp utan problem"
#: ajax/upload.php:27
msgid ""
@@ -48,7 +55,7 @@ msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
+msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
@@ -56,11 +63,11 @@ msgstr "Den uppladdade filen var endast delvis uppladdad"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Ingen fil laddades upp"
+msgstr "Ingen fil blev uppladdad"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "En temporär mapp saknas"
+msgstr "Saknar en tillfällig mapp"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +85,15 @@ msgstr "Felaktig mapp."
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Dela"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Radera permanent"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Radera"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Byt namn"
@@ -132,7 +135,7 @@ msgstr "1 filuppladdning"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "filer laddas upp"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +167,7 @@ msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes"
+msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
#: js/files.js:272
msgid "Not enough space available"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 990e7bf176..a1c717ce9f 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André <lokal_profil@hotmail.com>, 2013.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 9ebda80a2d..e58feaa6ce 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André <lokal_profil@hotmail.com>, 2013.
+# Magnus Höglund <magnus@linux.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "Ange en giltig Dropbox nyckel och hemlighet."
msgid "Error configuring Google Drive storage"
msgstr "Fel vid konfigurering av Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Extern lagring"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 2ba2bb298c..c8e79bb65d 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 45c3d95fd3..c917c8bda1 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André <lokal_profil@hotmail.com>, 2013.
+# Magnus Höglund <magnus@linux.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 7f6c0a26be..ada122d58b 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index d02feb64ea..13887eda44 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Magnus Höglund <magnus@linux.com>, 2012-2013
+# Magnus Höglund <magnus@linux.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +115,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
@@ -207,11 +209,11 @@ msgstr "%d timmar sedan"
#: template.php:118
msgid "today"
-msgstr "i dag"
+msgstr "idag"
#: template.php:119
msgid "yesterday"
-msgstr "i går"
+msgstr "igår"
#: template.php:120
#, php-format
@@ -235,6 +237,19 @@ msgstr "förra året"
msgid "years ago"
msgstr "Ã¥r sedan"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s finns. FÃ¥ <a href=\"%s\">mer information</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "uppdaterad"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "uppdateringskontroll är inaktiverad"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 6d8243e128..78e13f62c2 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,12 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André <lokal_profil@hotmail.com>, 2013.
+# Christer Eriksson <post@hc3web.com>, 2012.
+# Daniel Sandman <revoltism@gmail.com>, 2012.
+# <hakan.thn@gmail.com>, 2011.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
+# <magnus@linux.com>, 2012.
+# <q@xnq.me>, 2012.
+# <revoltism@gmail.com>, 2011, 2012.
+# <tscooter@hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +30,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Kan inte ladda listan från App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Fel vid autentisering"
+msgstr "Autentiseringsfel"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Kan inte ändra visningsnamn"
@@ -120,7 +125,7 @@ msgstr "Fel uppstod vid uppdatering av appen"
msgid "Updated"
msgstr "Uppdaterad"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Sparar..."
@@ -136,16 +141,16 @@ msgstr "Ã¥ngra"
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Radera"
@@ -165,7 +170,7 @@ msgstr "Fel vid skapande av användare"
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -235,23 +240,23 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "Exekvera en uppgift vid varje sidladdning"
+msgstr ""
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP."
+msgstr ""
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut."
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
@@ -259,11 +264,11 @@ msgstr "Dela"
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Aktivera delat API"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "Tillåt applikationer att använda delat API"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
@@ -271,7 +276,7 @@ msgstr "Tillåt länkar"
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "Tillåt delning till allmänheten via publika länkar"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
@@ -314,21 +319,21 @@ msgstr "Logg"
#: templates/admin.php:196
msgid "Log level"
-msgstr "Nivå på loggning"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Mer"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +404,7 @@ msgstr "Skaffa appar för att synkronisera dina filer"
msgid "Show First Run Wizard again"
msgstr "Visa Första uppstarts-guiden igen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Lösenord"
@@ -423,70 +428,82 @@ msgstr "Nytt lösenord"
msgid "Change password"
msgstr "Ändra lösenord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Visat namn"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Ditt visningsnamn har ändrats"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Kan inte ändra ditt visningsnamn"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Ändra visningsnamn"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Din e-postadress"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Hjälp att översätta"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Inloggningsnamn"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Skapa"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Förvald lagring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Obegränsad"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Annat"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "ändra visat namn"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "ange nytt lösenord"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 3d51619fa0..f75fdc8da0 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <admin@danielholm.se>, 2013.
+# André <lokal_profil@hotmail.com>, 2013.
+# Magnus Höglund <magnus@linux.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 09988ffea2..8a88331b36 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +293,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr ""
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +519,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +557,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 13e9c0e6db..5dd812bc1b 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 84ed219358..2d586daf24 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 9a1b8f84a9..f61afed330 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 327c56dc2f..324fbf714d 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index b865f9f8a6..dd07e32269 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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index 2a223ee7bb..d0251e6a97 100644
--- a/l10n/sw_KE/files_versions.po
+++ b/l10n/sw_KE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 88df9e82be..f2bae1c728 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index e93dc47057..f85fcdca12 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index b16b2afdf5..7c6391cdc5 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 40d5b280c9..50d6af9b6b 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sgrupan@gmail.com>, 2013.
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +295,7 @@ msgstr "இணைபà¯à®ªà¯à®Ÿà®©à¯ பகிரà¯à®¤à®²à¯"
msgid "Password protect"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ பாதà¯à®•à®¾à®¤à¯à®¤à®²à¯"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
@@ -331,7 +333,7 @@ msgstr "{பயனாளரà¯} உடன௠{உரà¯à®ªà¯à®ªà®Ÿà®¿} பக
#: js/share.js:308
msgid "Unshare"
-msgstr "பகிரபà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
+msgstr "பகிரமà¯à®Ÿà®¿à®¯à®¾à®¤à¯"
#: js/share.js:320
msgid "can edit"
@@ -343,7 +345,7 @@ msgstr "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà®¾à®© அணà¯à®•à®²à¯"
#: js/share.js:325
msgid "create"
-msgstr "உரà¯à®µà®µà®¾à®•à¯à®•à®²à¯"
+msgstr "படைதà¯à®¤à®²à¯"
#: js/share.js:328
msgid "update"
@@ -396,27 +398,24 @@ msgstr "ownCloud இன௠கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைபà¯
msgid "Use the following link to reset your password: {link}"
msgstr "உஙà¯à®•à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மீளமைகà¯à®• பினà¯à®µà®°à¯à®®à¯ இணைபà¯à®ªà¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯ : {இணைபà¯à®ªà¯}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "நீஙà¯à®•à®³à¯ மினà¯à®©à®žà¯à®šà®²à¯ மூலம௠உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மீளமைபà¯à®ªà®¤à®±à¯à®•à®¾à®© இணைபà¯à®ªà¯ˆ பெறà¯à®µà¯€à®°à¯à®•à®³à¯. "
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "பயனாளர௠பெயரà¯"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "கோரிகà¯à®•à¯ˆ மீளமைபà¯à®ªà¯"
@@ -442,15 +441,15 @@ msgstr "தனிபà¯à®ªà®Ÿà¯à®Ÿ"
#: strings.php:6
msgid "Users"
-msgstr "பயனாளரà¯"
+msgstr "பயனாளரà¯à®•à®³à¯"
#: strings.php:7
msgid "Apps"
-msgstr "செயலிகளà¯"
+msgstr "பயனà¯à®ªà®¾à®Ÿà¯à®•à®³à¯"
#: strings.php:8
msgid "Admin"
-msgstr "நிரà¯à®µà®¾à®•à®®à¯"
+msgstr "நிரà¯à®µà®¾à®•à®¿"
#: strings.php:9
msgid "Help"
@@ -516,86 +515,81 @@ msgstr "<strong> நிரà¯à®µà®¾à®• கணகà¯à®•à¯Šà®©à¯à®±à¯ˆ </strong>
#: templates/installation.php:62
msgid "Advanced"
-msgstr "உயரà¯à®¨à¯à®¤"
+msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ"
#: templates/installation.php:64
msgid "Data folder"
msgstr "தரவ௠கோபà¯à®ªà¯à®±à¯ˆ"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "தரவà¯à®¤à¯à®¤à®³à®¤à¯à®¤à¯ˆ தகவமைகà¯à®•"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®®à¯"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "தரவà¯à®¤à¯à®¤à®³ பயனாளரà¯"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "தரவà¯à®¤à¯à®¤à®³ கடவà¯à®šà¯à®šà¯Šà®²à¯"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "தரவà¯à®¤à¯à®¤à®³ பெயரà¯"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "தரவà¯à®¤à¯à®¤à®³ அடà¯à®Ÿà®µà®£à¯ˆ"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "தரவà¯à®¤à¯à®¤à®³ ஓமà¯à®ªà¯à®©à®°à¯"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "அமைபà¯à®ªà¯ˆ à®®à¯à®Ÿà®¿à®•à¯à®•"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "வலைய சேவைகள௠உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ கீழ௠உளà¯à®³à®¤à¯"
+msgstr "உஙà¯à®•à®³à¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ கீழ௠இணைய சேவைகளà¯"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "விடà¯à®ªà®¤à®¿à®•à¯ˆ செயà¯à®•"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "தனà¯à®©à®¿à®šà¯à®šà¯ˆà®¯à®¾à®© பà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ நிராகரிபà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ அணà¯à®®à¯ˆà®¯à®¿à®²à¯ மாறà¯à®±à®µà®¿à®²à¯à®²à¯ˆà®¯à®¿à®©à¯, உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கணகà¯à®•à¯ சமரசமாகிவிடà¯à®®à¯!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கணகà¯à®•à¯ˆ மீணà¯à®Ÿà¯à®®à¯ பாதà¯à®•à®¾à®•à¯à®• தயவà¯à®šà¯†à®¯à¯à®¤à¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மாறà¯à®±à®µà¯à®®à¯."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "உஙà¯à®•à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ தொலைதà¯à®¤à¯à®µà®¿à®Ÿà¯à®Ÿà¯€à®°à¯à®•à®³à®¾?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "ஞாபகபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "பà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 3e52791102..f26efe9217 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr ""
msgid "Files"
msgstr "கோபà¯à®ªà¯à®•à®³à¯"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "பகிரà¯à®µà¯"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
-msgstr "நீகà¯à®•à¯à®•"
+msgstr "அழிகà¯à®•"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "பெயரà¯à®®à®¾à®±à¯à®±à®®à¯"
@@ -253,7 +250,7 @@ msgstr "ZIP கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© ஆககà¯à®•à¯‚டி
#: templates/admin.php:26
msgid "Save"
-msgstr "சேமிகà¯à®• "
+msgstr "சேமிகà¯à®•"
#: templates/index.php:7
msgid "New"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index f8019b0d4a..59fde5c4fe 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 2d1e185537..678e681c2d 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "தயவà¯à®šà¯†à®¯à¯à®¤à¯ ஒர௠செலà¯à®²à¯à®ªà®Ÿà®¿à®¯
msgid "Error configuring Google Drive storage"
msgstr "Google இயகà¯à®• சேமிபà¯à®ªà®•à®¤à¯à®¤à¯ˆ தகமைபà¯à®ªà®¤à®¿à®²à¯ வழà¯"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "வெளி சேமிபà¯à®ªà¯"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 2522409a0d..1aef2d28b2 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index b6113a6d1d..924bbb462a 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index 6125b2b2da..7c7a4eee0b 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +51,7 @@ msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "பதிபà¯à®ªà¯à®•à®³à¯"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 5ab85c3d26..82184ac7e8 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# suganthi <suganthi@nic.lk>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +32,7 @@ msgstr "அமைபà¯à®ªà¯à®•à®³à¯"
#: app.php:385
msgid "Users"
-msgstr "பயனாளரà¯"
+msgstr "பயனாளரà¯à®•à®³à¯"
#: app.php:398
msgid "Apps"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +236,19 @@ msgstr "கடநà¯à®¤ வரà¯à®Ÿà®®à¯"
msgid "years ago"
msgstr "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s இனà¯à®©à¯à®®à¯ இரà¯à®•à¯à®•à®¿à®©à¯à®±à®©. <a href=\"%s\">மேலதிக தகவலà¯à®•à®³à¯à®•à¯à®•à¯</a> எடà¯à®•à¯à®•"
+
+#: 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\""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6fff478e03..7d988829d0 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "செயலி சேமிபà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ à®à®±à¯à®±à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯à®³à¯à®³à®¤à¯"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "அதà¯à®¤à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¿à®²à¯ வழà¯"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -98,7 +95,7 @@ msgstr "இயலà¯à®®à¯ˆà®ªà¯à®ª"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
+msgstr "செயலறà¯à®±à®¤à®¾à®•à¯à®•à¯à®•"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,9 +117,9 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯..."
+msgstr "இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
#: js/users.js:43
msgid "deleted"
@@ -136,18 +133,18 @@ msgstr "à®®à¯à®©à¯ செயல௠நீகà¯à®•à®®à¯ "
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "கà¯à®´à¯ நிரà¯à®µà®¾à®•à®¿"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
-msgstr "நீகà¯à®•à¯à®•"
+msgstr "அழிகà¯à®•"
#: js/users.js:262
msgid "add group"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_மொழி_பெயரà¯_"
@@ -316,19 +313,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "மேலதிக"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "கà¯à®±à¯ˆà®µà®¾à®©"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
@@ -423,70 +420,82 @@ msgstr "பà¯à®¤à®¿à®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯"
msgid "Change password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மாறà¯à®±à¯à®•"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "மினà¯à®©à®žà¯à®šà®²à¯"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ மினà¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯ மீள௠பெறà¯à®µà®¤à¯ˆ இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®µà®¤à®±à¯à®•à¯ மினà¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿à®¯à¯ˆ இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "மொழி"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "மொழிபெயரà¯à®•à¯à®• உதவி"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "உரà¯à®µà®¾à®•à¯à®•à¯à®•"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "மறà¯à®±à®µà¯ˆ"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index a82d11f9a1..6a582a0329 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 5e3424a27a..3077ce28a0 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# వీవెనౠ<veeven@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "సంకేతపదం"
@@ -396,27 +397,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "వాడà±à°•à°°à°¿ పేరà±"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -522,37 +520,37 @@ msgstr ""
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr ""
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr ""
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr ""
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr ""
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +558,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "మీ సంకేతపదం పోయిందా?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 3b1c8bdab4..47cac8cd8a 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# వీవెనౠ<veeven@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "శాశà±à°µà°¤à°‚à°—à°¾ తొలగించà±"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "తొలగించà±"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index d80b40f452..cf1d6e37e1 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 7f8b65ba98..0ad4883fc5 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 84ca97cc6a..8d26d12e93 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 373705a9ee..c7d0a59bc5 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_versions.po b/l10n/te/files_versions.po
index 2a514b335c..d69922bf83 100644
--- a/l10n/te/files_versions.po
+++ b/l10n/te/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index a51822fe45..3123d067aa 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr "పోయిన సంవతà±à°¸à°°à°‚"
msgid "years ago"
msgstr "సంవతà±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index f270bb90f0..3fe6424681 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# వీవెనౠ<veeven@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +117,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +133,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "తొలగించà±"
@@ -165,7 +162,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +313,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "మరినà±à°¨à°¿"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +396,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "సంకేతపదం"
@@ -423,70 +420,82 @@ msgstr "కొతà±à°¤ సంకేతపదం"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "మీ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "à°à°¾à°·"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 0166659309..4dceae3576 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 43806ecc13..35b43eb24d 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -396,27 +396,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
#: templates/login.php:19
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr ""
@@ -560,12 +557,7 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e4dcc585ee..89a7db1607 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
@@ -156,66 +152,66 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:226
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:264
+#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:277
+#: js/files.js:272
msgid "Not enough space available"
msgstr ""
-#: js/files.js:317
+#: js/files.js:312
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:413
+#: js/files.js:408
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:486
+#: js/files.js:481
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:491
+#: js/files.js:486
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
msgid "Error"
msgstr ""
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:872 templates/index.php:70
msgid "Name"
msgstr ""
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:873 templates/index.php:81
msgid "Size"
msgstr ""
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:874 templates/index.php:83
msgid "Modified"
msgstr ""
-#: js/files.js:898
+#: js/files.js:893
msgid "1 folder"
msgstr ""
-#: js/files.js:900
+#: js/files.js:895
msgid "{count} folders"
msgstr ""
-#: js/files.js:908
+#: js/files.js:903
msgid "1 file"
msgstr ""
-#: js/files.js:910
+#: js/files.js:905
msgid "{count} files"
msgstr ""
@@ -279,37 +275,37 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:55
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:62
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:76
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:108
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:118
msgid "Current scanning"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 0dbd3c7505..474450fd7d 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 99ed6fe07c..55b915b8c1 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting "
"of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d36a214d44..6da4a5a9c1 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index e8d8e484a4..6f7cd8036e 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 63354ff4ad..40c2e572fb 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 84cafdb47b..cf80a35b29 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -172,13 +172,13 @@ msgstr ""
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:854
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:855
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 2e98212a05..1b32c3ac1b 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -324,11 +320,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
@@ -423,70 +419,82 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index a6a852ad6f..bdb389c0b3 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a6324aaed7..98ae8159bd 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-04-30 01:57+0200\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index daec53114a..a5d768f9ca 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -243,7 +245,7 @@ msgstr "ชนิดขà¸à¸‡à¸§à¸±à¸•à¸–ุยังไม่ได้รับ
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr "ข้à¸à¸œà¸´à¸”พลาด"
+msgstr "พบข้à¸à¸œà¸´à¸”พลาด"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
@@ -293,7 +295,7 @@ msgstr "à¹à¸Šà¸£à¹Œà¸”้วยลิงà¸à¹Œ"
msgid "Password protect"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "รหัสผ่าน"
@@ -396,27 +398,24 @@ msgstr "รีเซ็ตรหัสผ่าน ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "ใช้ลิงค์ต่à¸à¹„ปนี้เพื่à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„ุณใหม่: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "คุณจะได้รับลิงค์เพื่à¸à¸à¸³à¸«à¸™à¸”รหัสผ่านใหม่ทางà¸à¸µà¹€à¸¡à¸¥à¹Œ"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "ขà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¹ƒà¸«à¸¡à¹ˆ"
@@ -446,11 +445,11 @@ msgstr "ผู้ใช้งาน"
#: strings.php:7
msgid "Apps"
-msgstr "à¹à¸à¸›à¸¯"
+msgstr "Apps"
#: strings.php:8
msgid "Admin"
-msgstr "ผู้ดูà¹à¸¥"
+msgstr "ผู้ดูà¹à¸¥à¸£à¸°à¸šà¸š"
#: strings.php:9
msgid "Help"
@@ -522,80 +521,75 @@ msgstr "ขั้นสูง"
msgid "Data folder"
msgstr "โฟลเดà¸à¸£à¹Œà¹€à¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "à¸à¸³à¸«à¸™à¸”ค่าà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "จะถูà¸à¹ƒà¸Šà¹‰"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "รหัสผ่านà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "ชื่à¸à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "พื้นที่ตารางในà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Database host"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "ติดตั้งเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "เว็บเซà¸à¸£à¹Œà¸§à¸´à¸ªà¸—ี่คุณควบคุมà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้"
+msgstr "web services under your control"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "à¸à¸²à¸£à¹€à¸‚้าสู่ระบบà¸à¸±à¸•à¹‚นมัติถูà¸à¸›à¸à¸´à¹€à¸ªà¸˜à¹à¸¥à¹‰à¸§"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "หาà¸à¸„ุณยังไม่ได้เปลี่ยนรหัสผ่านขà¸à¸‡à¸„ุณเมื่à¸à¹€à¸£à¹‡à¸§à¹†à¸™à¸µà¹‰, บัà¸à¸Šà¸µà¸‚à¸à¸‡à¸„ุณà¸à¸²à¸ˆà¸–ูà¸à¸šà¸¸à¸à¸£à¸¸à¸à¹‚ดยผู้à¸à¸·à¹ˆà¸™"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "à¸à¸£à¸¸à¸“าเปลี่ยนรหัสผ่านขà¸à¸‡à¸„ุณà¸à¸µà¸à¸„รั้ง เพื่à¸à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„ุณให้ปลà¸à¸”ภัย"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "ลืมรหัสผ่าน?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "จำรหัสผ่าน"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "เข้าสู่ระบบ"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 55940d310a..76c99829ca 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +39,7 @@ msgstr "ยังไม่มีไฟล์ใดที่ถูà¸à¸à¸±à¸žà¹‚
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "ไม่พบข้à¸à¸œà¸´à¸”พลาดใดๆ, ไฟล์ถูà¸à¸à¸±à¸žà¹‚หลดเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§"
+msgstr "ไม่มีข้à¸à¸œà¸´à¸”พลาดใดๆ ไฟล์ถูà¸à¸à¸±à¸žà¹‚หลดเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +50,19 @@ msgstr "ขนาดไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาด
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดไฟล์ใหà¸à¹ˆà¹€à¸à¸´à¸™à¸ˆà¸³à¸™à¸§à¸™à¸—ี่à¸à¸³à¸«à¸™à¸”ไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูà¸à¸£à¸°à¸šà¸¸à¹„ว้ในรูปà¹à¸šà¸šà¸‚à¸à¸‡ HTML"
+msgstr "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดเà¸à¸´à¸™à¸„ำสั่ง MAX_FILE_SIZE ที่ระบุเà¸à¸²à¹„ว้ในรูปà¹à¸šà¸šà¸„ำสั่งในภาษา HTML"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "ไฟล์ถูà¸à¸à¸±à¸žà¹‚หลดได้เพียงบางส่วนเท่านั้น"
+msgstr "ไฟล์ที่à¸à¸±à¸žà¹‚หลดยังไม่ได้ถูà¸à¸à¸±à¸žà¹‚หลดà¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¸šà¸¹à¸£à¸“์"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "ไม่มีไฟล์ที่ถูà¸à¸à¸±à¸žà¹‚หลด"
+msgstr "ยังไม่มีไฟล์ที่ถูà¸à¸à¸±à¸žà¹‚หลด"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "โฟลเดà¸à¸£à¹Œà¸Šà¸±à¹ˆà¸§à¸„ราวเà¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢"
+msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£à¸Šà¸±à¹ˆà¸§à¸„ราวเà¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +80,15 @@ msgstr "ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡"
msgid "Files"
msgstr "ไฟล์"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "à¹à¸Šà¸£à¹Œ"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "ลบ"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "เปลี่ยนชื่à¸"
@@ -132,7 +130,7 @@ msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚หลดไฟล์ 1 ไฟล์"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +162,7 @@ msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”าวน์โหลดข้à¸à¸¡
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ไม่สามารถà¸à¸±à¸žà¹‚หลดไฟล์ขà¸à¸‡à¸„ุณได้ เนื่à¸à¸‡à¸ˆà¸²à¸à¹„ฟล์ดังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µà¹ˆ หรืภมีขนาดไฟล์ 0 ไบต์"
+msgstr "ไม่สามารถà¸à¸±à¸žà¹‚หลดไฟล์ขà¸à¸‡à¸„ุณได้ เนื่à¸à¸‡à¸ˆà¸²à¸à¹„ฟล์ดังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¸«à¸£à¸·à¸à¸¡à¸µà¸‚นาด 0 ไบต์"
#: js/files.js:272
msgid "Not enough space available"
@@ -201,7 +199,7 @@ msgstr "ขนาด"
#: js/files.js:874 templates/index.php:83
msgid "Modified"
-msgstr "à¹à¸à¹‰à¹„ขà¹à¸¥à¹‰à¸§"
+msgstr "ปรับปรุงล่าสุด"
#: js/files.js:893
msgid "1 folder"
@@ -293,7 +291,7 @@ msgstr "ดาวน์โหลด"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
+msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index f6529f0dc5..ffe62d2598 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +36,4 @@ msgstr ""
#: templates/settings.php:12
msgid "None"
-msgstr "ไม่มี"
+msgstr "ไม่ต้à¸à¸‡"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 4aea7d4916..8ad035271a 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +38,19 @@ msgstr "à¸à¸£à¸¸à¸“าà¸à¸£à¸à¸à¸£à¸«à¸±à¸ª app key ขà¸à¸‡ Dropbox à¹à¸¥
msgid "Error configuring Google Drive storage"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าà¸à¸²à¸£à¸ˆà¸±à¸”เà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸žà¸·à¹‰à¸™à¸—ี่ขà¸à¸‡ Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>คำเตืà¸à¸™:</b> \"smbclient\" ยังไม่ได้ถูà¸à¸•à¸´à¸”ตั้ง. à¸à¸²à¸£à¸Šà¸µà¹‰ CIFS/SMB เพื่à¸à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ม่สามารถà¸à¸£à¸°à¸—ำได้ à¸à¸£à¸¸à¸“าสà¸à¸šà¸–ามข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”ตั้ง."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>คำเตืà¸à¸™:</b> à¸à¸²à¸£à¸ªà¸™à¸±à¸šà¸ªà¸™à¸¸à¸™à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ FTP ในภาษา PHP ยังไม่ได้ถูà¸à¹€à¸›à¸´à¸”ใช้งานหรืà¸à¸–ูà¸à¸•à¸´à¸”ตั้ง. à¸à¸²à¸£à¸Šà¸µà¹‰ FTP เพื่à¸à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ม่สามารถดำเนินà¸à¸²à¸£à¹„ด้ à¸à¸£à¸¸à¸“าสà¸à¸šà¸–ามข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”ตั้ง"
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "พื้นทีจัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸ˆà¸²à¸à¸ ายนà¸à¸"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index eab4fbbbd7..4d2deef16b 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 59f6d74901..9c184200fe 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 2ed8da96a5..4abcac4e0d 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +51,7 @@ msgstr ""
#: js/versions.js:6
msgid "Versions"
-msgstr "รุ่น"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index cbe2379999..4ede057cbd 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -113,83 +114,83 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
#: template.php:113
msgid "seconds ago"
-msgstr "วินาที à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+msgstr "วินาทีที่ผ่านมา"
#: template.php:114
msgid "1 minute ago"
-msgstr "1 นาทีà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+msgstr "1 นาทีมาà¹à¸¥à¹‰à¸§"
#: template.php:115
#, php-format
@@ -233,7 +234,20 @@ msgstr "ปีที่à¹à¸¥à¹‰à¸§"
#: template.php:124
msgid "years ago"
-msgstr "ปี ที่ผ่านมา"
+msgstr "ปีที่ผ่านมา"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s พร้à¸à¸¡à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้à¹à¸¥à¹‰à¸§. <a href=\"%s\">ดูรายละเà¸à¸µà¸¢à¸”เพิ่มเติม</a>"
+
+#: 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
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b25982bed3..c239256ebe 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
+# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
+# <icewind1991@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "ไม่สามารถโหลดรายà¸à¸²à¸£à¸ˆà¸²à¸ App Store ได้"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในสิทธิ์à¸à¸²à¸£à¹€à¸‚้าใช้งาน"
+msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดเà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸ªà¸´à¸—ธิ์à¸à¸²à¸£à¹€à¸‚้าใช้งาน"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,9 +119,9 @@ msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในระหว่างà¸
msgid "Updated"
msgstr "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸à¸‚้à¸à¸¡à¸¹à¸¥..."
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึุà¸à¸‚้à¸à¸¡à¸¹à¸¥..."
#: js/users.js:43
msgid "deleted"
@@ -136,16 +135,16 @@ msgstr "เลิà¸à¸—ำ"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "à¸à¸¥à¸¸à¹ˆà¸¡"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "ผู้ดูà¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "ลบ"
@@ -165,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "ภาษาไทย"
@@ -235,59 +234,59 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "ประมวลคำสั่งหนึ่งงานในà¹à¸•à¹ˆà¸¥à¸°à¸„รั้งที่มีà¸à¸²à¸£à¹‚หลดหน้าเว็บ"
+msgstr ""
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php ได้รับà¸à¸²à¸£à¸¥à¸‡à¸—ะเบียนà¹à¸¥à¹‰à¸§à¸à¸±à¸šà¹€à¸§à¹‡à¸šà¸œà¸¹à¹‰à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£ webcron เรียà¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸š cron.php ที่ตำà¹à¸«à¸™à¹ˆà¸‡ root ขà¸à¸‡ owncloud หลังจาà¸à¸™à¸µà¹‰à¸ªà¸±à¸à¸„รู่ผ่านทาง http"
+msgstr ""
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "ใช้บริà¸à¸²à¸£ cron จาà¸à¸£à¸°à¸šà¸š เรียà¸à¹„ฟล์ cron.php ในโฟลเดà¸à¸£à¹Œ owncloud ผ่านทาง cronjob ขà¸à¸‡à¸£à¸°à¸šà¸šà¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸™à¸µà¹‰à¸ªà¸±à¸à¸„รู่"
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "เปิดใช้งาน API สำหรับคุณสมบัติà¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸à¸›à¸¯à¸ªà¸²à¸¡à¸²à¸£à¸–ใช้ API สำหรับà¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ด้"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸¥à¸´à¸‡à¸à¹Œà¹„ด้"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¹„ปให้สาธารณะชนเป็นลิงà¸à¹Œà¹„ด้"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹ƒà¸«à¸¡à¹ˆà¹„ด้"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¸—ี่ถูà¸à¹à¸Šà¸£à¹Œà¸¡à¸²à¹ƒà¸«à¹‰à¸•à¸±à¸§à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้เท่านั้น"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸–ึงใครà¸à¹‡à¹„ด้"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ด้เฉพาะà¸à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¹€à¸”ียวà¸à¸±à¸™à¹€à¸—่านั้น"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +309,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "บันทึà¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
-msgstr "ระดับà¸à¸²à¸£à¹€à¸à¹‡à¸šà¸šà¸±à¸™à¸—ึภlog"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "มาà¸"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "น้à¸à¸¢"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "à¹à¸ªà¸”งหน้าจà¸à¸§à¸´à¸‹à¸²à¸£à¹Œà¸”นำทางครั้งà¹à¸£à¸à¸à¸µà¸à¸„รั้ง"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "รหัสผ่าน"
@@ -423,70 +422,82 @@ msgstr "รหัสผ่านใหม่"
msgid "Change password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "ชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹à¸ªà¸”ง"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "à¸à¸µà¹€à¸¡à¸¥"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr "à¸à¸µà¹€à¸¡à¸¥à¹Œ"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "ที่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณ"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "à¸à¸£à¸à¸à¸—ี่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณเพื่à¸à¹€à¸›à¸´à¸”ให้มีà¸à¸²à¸£à¸à¸¹à¹‰à¸„ืนรหัสผ่านได้"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "ภาษา"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "ช่วยà¸à¸±à¸™à¹à¸›à¸¥"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ใช้ที่à¸à¸¢à¸¹à¹ˆà¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸à¸±à¸š ownCloud ในโปรà¹à¸à¸£à¸¡à¸ˆà¸±à¸”à¸à¸²à¸£à¹„ฟล์ขà¸à¸‡à¸„ุณ"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "สร้าง"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "พื้นที่จำà¸à¸±à¸”ข้à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "ไม่จำà¸à¸±à¸”จำนวน"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "à¸à¸·à¹ˆà¸™à¹†"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "เปลี่ยนชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹ƒà¸«à¹‰à¹à¸ªà¸”ง"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "ตั้งค่ารหัสผ่านใหม่"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index a085e8c732..fdda463b0f 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 20f16df25d..943cc42487 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -3,13 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011, 2012
+# Caner BaÅŸaran <basaran.caner@gmail.com>, 2012
+# otefenli <otefenli@gmail.com>, 2013
+# ifthenelse <ifthenelse@gmx.com>, 2013
+# alpere <info@beyboo.de>, 2012
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
+# Necdet Yücel <necdetyucel@gmail.com>, 2012
+# atakan96 <tayancatakan@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 07:40+0000\n"
+"Last-Translator: ifthenelse <ifthenelse@gmx.com>\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"
@@ -396,27 +404,24 @@ msgstr "ownCloud parola sıfırlama"
msgid "Use the following link to reset your password: {link}"
msgstr "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Sıfırlama epostası gönderildi."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Ä°stek reddedildi!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
#: templates/login.php:19
msgid "Username"
-msgstr "Kullanıcı Adı"
+msgstr "Kullanıcı adı"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Sıfırlama iste"
@@ -558,14 +563,9 @@ msgstr "Kurulumu tamamla"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "Bilgileriniz güvenli ve şifreli"
-
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "kontrolünüzdeki web servisleri"
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Çıkış yap"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 826904dd18..c9fcbdb563 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Caner BaÅŸaran <basaran.caner@gmail.com>, 2012.
+# Emre <emresaracoglu@live.com>, 2012.
+# <info@beyboo.de>, 2012.
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
+# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +44,7 @@ msgstr "Dosya yüklenmedi. Bilinmeyen hata"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
+msgstr "Bir hata yok, dosya başarıyla yüklendi"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +55,19 @@ msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme s
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
+msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Dosya kısmen karşıya yüklenebildi"
+msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Hiç dosya gönderilmedi"
+msgstr "Hiç dosya yüklenmedi"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "Geçici dizin eksik"
+msgstr "Geçici bir klasör eksik"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,19 +85,15 @@ msgstr "Geçersiz dizin."
msgid "Files"
msgstr "Dosyalar"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "PaylaÅŸ"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Kalıcı olarak sil"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Sil"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Ä°sim deÄŸiÅŸtir."
@@ -193,7 +196,7 @@ msgstr "Hata"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "Ä°sim"
+msgstr "Ad"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -297,7 +300,7 @@ msgstr "Paylaşılmayan"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "Yükleme çok büyük"
+msgstr "Yüklemeniz çok büyük"
#: templates/index.php:110
msgid ""
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index e97475fd97..445755c59c 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
+# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index b3199728fd..a52ac427e9 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -3,13 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Caner BaÅŸaran <basaran.caner@gmail.com>, 2013
+# Necdet Yücel <necdetyucel@gmail.com>, 2012
+# atakan96 <tayancatakan@gmail.com>, 2013
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 15:10+0000\n"
+"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\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"
@@ -37,26 +41,19 @@ msgstr "Lütfen Dropbox app key ve secret temin ediniz"
msgid "Error configuring Google Drive storage"
msgstr "Google Drive depo yapılandırma hatası"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Uyari.</b>''smbclient''yüklü değil. Mont etme CIFS/SMB hissenin mümkün değildir. Lutfen kullanici sistemin sormak onu yuklemek ici, "
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<Uyari.</b>. Sistem FTP PHPden aktif degil veya yuklemedi. Monte etme hissenin FTP mumkun degildir. Lutfen kullaniici sistemin sormak onu yuklemek icin."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b> Ihbar </b>. Dayanma Curl PHPden aktif veya yuklemedi degil. Monte ownClouden/WebDay veya GoogleDrive mumkun degil. Lutfen sistm yonetici sormak yuklemek icin. "
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Harici Depolama"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 58a33bd65a..365c9b3a7d 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <info@beyboo.de>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Parola"
+msgstr "Åžifre"
#: templates/authenticate.php:6
msgid "Submit"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 7727f20a77..2354e94204 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
+# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 191e24b1a3..bf1b595e50 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
+# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 8c795e8401..6f7a085617 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
+# Necdet Yücel <necdetyucel@gmail.com>, 2012
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 16:03+0000\n"
+"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\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"
@@ -19,7 +22,7 @@ msgstr ""
#: app.php:349
msgid "Help"
-msgstr "Yardım"
+msgstr "Yardı"
#: app.php:362
msgid "Personal"
@@ -172,13 +175,13 @@ msgstr ""
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:854
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
-#: setup.php:859
+#: setup.php:855
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
@@ -235,6 +238,19 @@ msgstr "geçen yıl"
msgid "years ago"
msgstr "yıl önce"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s kullanılabilir durumda. <a href=\"%s\">Daha fazla bilgi</a> alın"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "güncel"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "güncelleme kontrolü kapalı"
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index becaab7ae2..86e9e92833 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -3,12 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Aranel Surion <aranel@aranelsurion.org>, 2011-2013.
+# Caner BaÅŸaran <basaran.caner@gmail.com>, 2013.
+# Emre <emresaracoglu@live.com>, 2012.
+# Fatih Aşıcı <fatih.asici@gmail.com>, 2013.
+# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
+# <info@beyboo.de>, 2012.
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
+# Tolga GezginiÅŸ <tgezginis@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +30,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "App Store'dan liste yüklenemiyor"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Kimlik doğrulama hatası"
+msgstr "EÅŸleÅŸme hata"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Ekran adı değiştirilemiyor"
@@ -98,7 +103,7 @@ msgstr "Etkin deÄŸil"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "EtkinleÅŸtir"
+msgstr "Etkin"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,7 +125,7 @@ msgstr "Uygulama güncellenirken hata"
msgid "Updated"
msgstr "Güncellendi"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Kaydediliyor..."
@@ -136,16 +141,16 @@ msgstr "geri al"
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Sil"
@@ -165,7 +170,7 @@ msgstr "Kullanıcı oluşturulurken hata"
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Türkçe"
@@ -316,19 +321,19 @@ msgstr "Kayıtlar"
msgid "Log level"
msgstr "Günlük seviyesi"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Daha fazla"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Az"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Sürüm"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +404,7 @@ msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
msgid "Show First Run Wizard again"
msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Parola"
@@ -423,70 +428,82 @@ msgstr "Yeni parola"
msgid "Change password"
msgstr "Parola deÄŸiÅŸtir"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Ekran Adı"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Ekran adınız değiştirildi"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Ekran adınız değiştirilemiyor"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Ekran adını değiştir"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Eposta"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Eposta adresiniz"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Dil"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Çevirilere yardım edin"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Giriş Adı"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "OluÅŸtur"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Varsayılan Depolama"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Limitsiz"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "DiÄŸer"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Depolama"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "ekran adını değiştir"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "yeni parola belirle"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index dad1224648..fa5df1f463 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012
+# atakan96 <tayancatakan@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-23 01:58+0200\n"
+"PO-Revision-Date: 2013-04-22 07:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -23,19 +25,19 @@ msgstr ""
#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
-msgstr "Uyunlama mantikli ve baglama yerlestirmek edebilmi."
+msgstr ""
#: ajax/testConfiguration.php:39
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. "
+msgstr ""
#: ajax/testConfiguration.php:43
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
-msgstr "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. "
+msgstr ""
#: js/settings.js:66
msgid "Deletion failed"
@@ -43,7 +45,7 @@ msgstr "Silme başarısız oldu"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr "Parametri sonadan uyunlama cikarmak mi?"
+msgstr ""
#: js/settings.js:83
msgid "Keep settings?"
@@ -51,7 +53,7 @@ msgstr "Ayarları kalsınmı?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr "Sunucu uyunlama birlemek edemen. "
+msgstr ""
#: js/settings.js:121
msgid "Connection test succeeded"
@@ -63,7 +65,7 @@ msgstr "Bağlantı testi başarısız oldu"
#: js/settings.js:136
msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Hakikatten, Sonuncu Funksyon durmak istiyor mi?"
+msgstr ""
#: js/settings.js:137
msgid "Confirm Deletion"
@@ -74,13 +76,13 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. "
+msgstr ""
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin."
+msgstr ""
#: templates/settings.php:15
msgid "Server configuration"
@@ -97,7 +99,7 @@ msgstr "Sunucu"
#: templates/settings.php:38
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. "
+msgstr ""
#: templates/settings.php:39
msgid "Base DN"
@@ -105,11 +107,11 @@ msgstr "Ana DN"
#: templates/settings.php:40
msgid "One Base DN per line"
-msgstr "Bir Tabani DN herbir dizi. "
+msgstr ""
#: templates/settings.php:41
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. "
+msgstr ""
#: templates/settings.php:43
msgid "User DN"
@@ -120,7 +122,7 @@ msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr "DN musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. "
+msgstr ""
#: templates/settings.php:46
msgid "Password"
@@ -139,7 +141,7 @@ msgstr "Kullanıcı Oturum Filtresi"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
+msgstr ""
#: templates/settings.php:54
#, php-format
@@ -152,7 +154,7 @@ msgstr "Kullanıcı Liste Filtresi"
#: templates/settings.php:58
msgid "Defines the filter to apply, when retrieving users."
-msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi kullanici geri aliyor. "
+msgstr ""
#: templates/settings.php:59
msgid "without any placeholder, e.g. \"objectClass=person\"."
@@ -164,11 +166,11 @@ msgstr "Grup Süzgeci"
#: templates/settings.php:63
msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
+msgstr ""
#: templates/settings.php:64
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
+msgstr ""
#: templates/settings.php:68
msgid "Connection Settings"
@@ -228,7 +230,7 @@ msgstr "SSL sertifika doğrulamasını kapat."
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
+msgstr ""
#: templates/settings.php:77
msgid "Not recommended, use for testing only."
@@ -248,7 +250,7 @@ msgstr ""
#: templates/settings.php:82
msgid "User Display Name Field"
-msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
+msgstr ""
#: templates/settings.php:82
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -272,11 +274,11 @@ msgstr ""
#: templates/settings.php:85
msgid "Group Display Name Field"
-msgstr "Grub Ekrane Alani Adi"
+msgstr ""
#: templates/settings.php:85
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP kullamayin grub adi ownCloud uremek icin. "
+msgstr ""
#: templates/settings.php:86
msgid "Base Group Tree"
@@ -284,7 +286,7 @@ msgstr "Temel Grup Ağacı"
#: templates/settings.php:86
msgid "One Group Base DN per line"
-msgstr "Bir Grubu Tabani DN her dizgi. "
+msgstr ""
#: templates/settings.php:87
msgid "Group Search Attributes"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 8c37c90736..7935fe6434 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dzubchikd@gmail.com>, 2012.
+# <skoptev@ukr.net>, 2012.
+# Soul Kim <warlock.rf@gmail.com>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
+# <volodya327@gmail.com>, 2013.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +299,7 @@ msgstr "Опублікувати через поÑиланнÑ"
msgid "Password protect"
msgstr "ЗахиÑтити паролем"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Пароль"
@@ -331,7 +337,7 @@ msgstr "Опубліковано {item} Ð´Ð»Ñ {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "Закрити доÑтуп"
+msgstr "Заборонити доÑтуп"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +402,24 @@ msgstr "ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ownCloud"
msgid "Use the following link to reset your password: {link}"
msgstr "ВикориÑтовуйте наÑтупне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Ви отримаєте поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ паролю на Ел. пошту."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Запит ÑкиданнÑ"
@@ -450,7 +453,7 @@ msgstr "Додатки"
#: strings.php:8
msgid "Admin"
-msgstr "Ðдмін"
+msgstr "ÐдмініÑтратор"
#: strings.php:9
msgid "Help"
@@ -522,80 +525,75 @@ msgstr "Додатково"
msgid "Data folder"
msgstr "Каталог даних"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ даних"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "буде викориÑтано"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "КориÑтувач бази даних"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Пароль Ð´Ð»Ñ Ð±Ð°Ð·Ð¸ даних"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Ðазва бази даних"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð±Ð°Ð·Ð¸ даних"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "ХоÑÑ‚ бази даних"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Завершити налаштуваннÑ"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "підконтрольні Вам веб-ÑервіÑи"
+msgstr "веб-ÑÐµÑ€Ð²Ñ–Ñ Ð¿Ñ–Ð´ вашим контролем"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Вихід"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Ðвтоматичний вхід в ÑиÑтему відхилений!"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Якщо Ви не мінÑли пароль оÑтаннім чаÑом, Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð¼Ð¾Ð¶Ðµ бути Ñкомпрометованим!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Будь лаÑка, змініть Ñвій пароль, щоб знову захиÑтити Ваш обліковий запиÑ."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Забули пароль?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "запам'Ñтати"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Вхід"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Ðльтернативні Логіни"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 6f4e493551..3afb162edb 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dzubchikd@gmail.com>, 2012.
+# <skoptev@ukr.net>, 2012.
+# Soul Kim <warlock.rf@gmail.com>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +82,15 @@ msgstr "Ðевірний каталог."
msgid "Files"
msgstr "Файли"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "ПоділитиÑÑ"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Видалити назавжди"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Видалити"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Перейменувати"
@@ -221,7 +221,7 @@ msgstr "{count} файлів"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Вивантажити"
+msgstr "Відвантажити"
#: templates/admin.php:5
msgid "File handling"
@@ -293,7 +293,7 @@ msgstr "Завантажити"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Закрити доÑтуп"
+msgstr "Заборонити доÑтуп"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 2d3d805e58..8e820298fb 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <skoptev@ukr.net>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index ef3ddfd152..9247439d55 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <skoptev@ukr.net>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Будь лаÑка, надайте дійÑний ключ та пар
msgid "Error configuring Google Drive storage"
msgstr "Помилка при налаштуванні Ñховища Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>ПопередженнÑ:</b> Клієнт \"smbclient\" не вÑтановлено. Під'єднанатиÑÑ Ð´Ð¾ CIFS/SMB тек неможливо. Попрохайте ÑиÑтемного адмініÑтратора вÑтановити його."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>ПопередженнÑ:</b> Підтримка FTP в PHP не увімкнута чи не вÑтановлена. Під'єднанатиÑÑ Ð´Ð¾ FTP тек неможливо. Попрохайте ÑиÑтемного адмініÑтратора вÑтановити Ñ—Ñ—."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Зовнішні Ñховища"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index a78808b327..a6b224557e 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <skoptev@ukr.net>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +25,7 @@ msgstr "Пароль"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Передати"
+msgstr "Submit"
#: templates/public.php:10
#, php-format
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 37b8c49480..bb48add59d 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 9cdb2fdef6..95c4cb2064 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <skoptev@ukr.net>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index af5a7ee2d8..d630772076 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dmytro Dzubenko <dzubchikd@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
+# VicDeo <victor.dubiniuk@gmail.com>, 2012
+# volodya327 <volodya327@gmail.com>, 2013
+# volodya327 <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +118,72 @@ msgstr "%s не можна викориÑтовувати крапки в наз
msgid "%s set the database host."
msgstr "%s вÑтановити хоÑÑ‚ бази даних."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "Вам потрібно ввеÑти або Ñ–Ñнуючий обліковий Ð·Ð°Ð¿Ð¸Ñ Ð°Ð±Ð¾ administrator."
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "Помилка БД: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Команда, що викликала проблему: \"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "КориÑтувач MySQL '%s'@'localhost' вже Ñ–Ñнує."
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "Видалити цього кориÑтувача з MySQL"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "КориÑтувач MySQL '%s'@'%%' вже Ñ–Ñнує"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "Видалити цього кориÑтувача з MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Команда, що викликала проблему: \"%s\", ім'Ñ: %s, пароль: %s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні: %s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш Web-Ñервер ще не налаштований належним чином Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб дозволити Ñинхронізацію файлів, через те що Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, здаєтьÑÑ, зламаний."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Будь лаÑка, перевірте <a href='%s'>інÑтрукції по вÑтановленню</a>."
@@ -235,6 +240,19 @@ msgstr "минулого року"
msgid "years ago"
msgstr "роки тому"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s доÑтупно. Отримати <a href=\"%s\">детальну інформацію</a>"
+
+#: 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\""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 5a52fbc66e..01c6e47b02 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dzubchikd@gmail.com>, 2012.
+# <skoptev@ukr.net>, 2012.
+# <volodya327@gmail.com>, 2012-2013.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +25,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÑпиÑок з App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Помилка автентифікації"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ зображене ім'Ñ"
@@ -68,7 +68,7 @@ msgstr "Мова змінена"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "Ðекоректний запит"
+msgstr "Помилковий запит"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -120,7 +120,7 @@ msgstr "Помилка при оновленні програми"
msgid "Updated"
msgstr "Оновлено"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "Зберігаю..."
@@ -136,16 +136,16 @@ msgstr "відмінити"
msgid "Unable to remove user"
msgstr "Ðеможливо видалити кориÑтувача"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "ÐдмініÑтратор групи"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Видалити"
@@ -165,7 +165,7 @@ msgstr "Помилка при Ñтворенні кориÑтувача"
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -316,19 +316,19 @@ msgstr "Протокол"
msgid "Log level"
msgstr "Рівень протоколюваннÑ"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "Більше"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Менше"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "ВерÑÑ–Ñ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Отримати додатки Ð´Ð»Ñ Ñинхронізації ваш
msgid "Show First Run Wizard again"
msgstr "Показувати МайÑтер Ðалаштувань знову"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Пароль"
@@ -423,70 +423,82 @@ msgstr "Ðовий пароль"
msgid "Change password"
msgstr "Змінити пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Показати Ім'Ñ"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Ваше ім'Ñ Ð±ÑƒÐ»Ð¾ змінене"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Ðеможливо змінити ваше зображене ім'Ñ"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Змінити зображене ім'Ñ"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Ел.пошта"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Ваша адреÑа електронної пошти"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Введіть адреÑу електронної пошти Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Мова"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Допомогти з перекладом"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ВикориÑтовуйте цю адреÑу Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ вашого ownCloud у вашому файловому менеджері"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Створити"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Ñховище за замовчуваннÑм"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Ðеобмежено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Інше"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Сховище"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "змінити зображене ім'Ñ"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "вÑтановити новий пароль"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "За замовчуваннÑм"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 89484b09ee..2f5feed2a8 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <victor.dubiniuk@gmail.com>, 2012.
+# <volodya327@gmail.com>, 2012.
+# пан Володимир <volodya327@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index dab44591bd..2439188cfc 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# M. Adil Javed <adilone@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +294,7 @@ msgstr "لنک کے ساتھ شئیر کریں"
msgid "Password protect"
msgstr "پاسورڈ سے Ù…ØÙوظ کریں"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "پاسورڈ"
@@ -396,27 +397,24 @@ msgstr "اون کلاؤڈ پاسورڈ ری سیٹ"
msgid "Use the following link to reset your password: {link}"
msgstr "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
msgstr "یوزر نیم"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "ری سیٹ کی درخواست کریں"
@@ -522,37 +520,37 @@ msgstr "ایڈوانسڈ"
msgid "Data folder"
msgstr "ڈیٹا Ùولڈر"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "ڈیٹا بیس کونÙگر کریں"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "استعمال ÛÙˆ گا"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "ڈیٹابیس یوزر"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "ڈیٹابیس پاسورڈ"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "ڈیٹابیس کا نام"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "ڈیٹابیس ٹیبل سپیس"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "ڈیٹابیس Ûوسٹ"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "سیٹ اپ ختم کریں"
@@ -560,42 +558,37 @@ msgstr "سیٹ اپ ختم کریں"
msgid "web services under your control"
msgstr "آپ کے اختیار میں ویب سروسیز"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "لاگ آؤٹ"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "کیا آپ پاسورڈ بھول گئے Ûیں؟"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "یاد رکھیں"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "لاگ ان"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 11f0069a81..acb0e8f71a 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +78,15 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:116
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
@@ -293,7 +289,7 @@ msgstr ""
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "شئیرنگ ختم کریں"
+msgstr ""
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 155fc654d0..b5f46680a0 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index c1a5f1dda0..f6e9d577bd 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 3310ed7453..9fdf3a11ba 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 4191c25867..af2b0dbd1a 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index 3cd19f481f..7d34dde439 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index f12d98a35a..16489f21cc 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index df2fa2592c..39b956ddc5 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr ""
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "پاسورڈ"
@@ -423,70 +419,82 @@ msgstr "نیا پاسورڈ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
-msgid "Email"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
msgstr ""
#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 88926609e2..70d82c44bd 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index d664c1fa06..1accb85dd1 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -3,12 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <khanhnd@kenhgiaiphap.vn>, 2012.
+# <mattheu.9x@gmail.com>, 2012.
+# <mattheu_9x@yahoo.com>, 2012.
+# sao sang <saosangmo@yahoo.com>, 2013.
+# Son Nguyen <sonnghit@gmail.com>, 2012.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +79,7 @@ msgstr "Lá»—i thêm %s và o mục yêu thÃch."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "Bạn chÆ°a chá»n mục để xóa"
+msgstr "Không có thể loại nà o được chá»n để xóa."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -293,7 +299,7 @@ msgstr "Chia sẻ với liên kết"
msgid "Password protect"
msgstr "Máºt khẩu bảo vệ"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "Máºt khẩu"
@@ -331,7 +337,7 @@ msgstr "Äã được chia sẽ trong {item} vá»›i {user}"
#: js/share.js:308
msgid "Unshare"
-msgstr "BỠchia sẻ"
+msgstr "Gỡ bỠchia sẻ"
#: js/share.js:320
msgid "can edit"
@@ -396,27 +402,24 @@ msgstr "Khôi phục máºt khẩu Owncloud "
msgid "Use the following link to reset your password: {link}"
msgstr "Dùng Ä‘Æ°á»ng dẫn sau để khôi phục lại máºt khẩu : {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "Vui lòng kiểm tra Email để khôi phục lại máºt khẩu."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr "Thiết láºp lại email gởi."
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr "Yêu cầu của bạn không thà nh công !"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
+#: templates/login.php:28
msgid "Username"
-msgstr "Tên đăng nháºp"
+msgstr "Tên ngÆ°á»i dùng"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "Yêu cầu thiết láºp lại "
@@ -442,7 +445,7 @@ msgstr "Cá nhân"
#: strings.php:6
msgid "Users"
-msgstr "NgÆ°á»i dùng"
+msgstr "NgÆ°á»i sá» dụng"
#: strings.php:7
msgid "Apps"
@@ -466,7 +469,7 @@ msgstr "Không tìm thấy Clound"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr "Sá»a chuyên mục"
+msgstr "Sá»a thể loại"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -522,80 +525,75 @@ msgstr "Nâng cao"
msgid "Data folder"
msgstr "Thư mục dữ liệu"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "Cấu hình cơ sở dữ liệu"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "được sỠdụng"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "NgÆ°á»i dùng cÆ¡ sở dữ liệu"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "Máºt khẩu cÆ¡ sở dữ liệu"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "Tên cơ sở dữ liệu"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "Cơ sở dữ liệu tablespace"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "Database host"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "Cà i đặt hoà n tất"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "dịch vụ web dưới sự kiểm soát của bạn"
+msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "Äăng xuất"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Tá»± Ä‘á»™ng đăng nháºp đã bị từ chối !"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Nếu bạn không thay đổi máºt khẩu gần đây của bạn, tà i khoản của bạn có thể gặp nguy hiểm!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Vui lòng thay đổi máºt khẩu của bạn để đảm bảo tà i khoản của bạn má»™t lần nữa."
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Bạn quên máºt khẩu ?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "ghi nhá»›"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Äăng nháºp"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "Äăng nháºp khác"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 8a9cc15448..79bf00204a 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <khanhnd@kenhgiaiphap.vn>, 2012.
+# <mattheu.9x@gmail.com>, 2012.
+# <mattheu_9x@yahoo.com>, 2012.
+# sao sang <saosangmo@yahoo.com>, 2013.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +53,15 @@ msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini:
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Táºp tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML"
+msgstr "KÃch thÆ°á»›c những táºp tin tải lên vượt quá MAX_FILE_SIZE đã được quy định"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Các táºp tin được tải lên chỉ tải lên được má»™t phần"
+msgstr "Táºp tin tải lên má»›i chỉ tải lên được má»™t phần"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Chưa có file nà o được tải lên"
+msgstr "Không có táºp tin nà o được tải lên"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,25 +83,21 @@ msgstr "Thư mục không hợp lệ"
msgid "Files"
msgstr "Táºp tin"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Chia sẻ"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "Xóa vĩnh vễn"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Xóa"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "Sá»a tên"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "Äang chá»"
+msgstr "Chá»"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -132,7 +133,7 @@ msgstr "1 tệp tin đang được tải lên"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "tệp tin đang được tải lên"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +165,7 @@ msgstr "Your download is being prepared. This might take some time if the files
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Không thể tải lên táºp tin của bạn ,nó nhÆ° là má»™t thÆ° mục hoặc có 0 byte"
+msgstr "Không thể tải lên táºp tin nà y do nó là má»™t thÆ° mục hoặc kÃch thÆ°á»›c táºp tin bằng 0 byte"
#: js/files.js:272
msgid "Not enough space available"
@@ -289,11 +290,11 @@ msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
#: templates/index.php:76
msgid "Download"
-msgstr "Tải vá»"
+msgstr "Tải xuống"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "BỠchia sẻ"
+msgstr "Không chia sẽ"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 378186a7fc..76448eaa08 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# sao sang <saosangmo@yahoo.com>, 2013.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -35,4 +37,4 @@ msgstr "Việc mã hóa không bao gồm loại file sau"
#: templates/settings.php:12
msgid "None"
-msgstr "Không gì cả"
+msgstr "Không có gì hết"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 5a4d0493a7..1d8f070f12 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mattheu_9x@yahoo.com>, 2012.
+# sao sang <saosangmo@yahoo.com>, 2013.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã b
msgid "Error configuring Google Drive storage"
msgstr "Lỗi cấu hình lưu trữ Google Drive"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Cảnh báo:</b> \"smbclient\" chÆ°a được cà i đặt. Mount CIFS/SMB shares là không thể thá»±c hiện được. Hãy há»i ngÆ°á»i quản trị hệ thống để cà i đặt nó."
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>Cảnh báo:</b> FTP trong PHP chưa được cà i đặt hoặc chưa được mở. Mount FTP shares là không thể. Xin hãy yêu cầu quản trị hệ thống của bạn cà i đặt nó."
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "Lưu trữ ngoà i"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 97af1379ae..baddc87930 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mattheu_9x@yahoo.com>, 2012.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 5131f96d88..83efb8ffba 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# sao sang <saosangmo@yahoo.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index f65e940269..207ecde6dc 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <khanhnd@kenhgiaiphap.vn>, 2012.
+# sao sang <saosangmo@yahoo.com>, 2013.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +53,7 @@ msgstr "Không chỉ ra Ä‘Æ°á»ng dẫn rõ rà ng"
#: js/versions.js:6
msgid "Versions"
-msgstr "Phiên bản"
+msgstr ""
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 186aeccd94..fc813abbb5 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -3,12 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mattheu_9x <mattheu.9x@gmail.com>, 2012
+# mattheu_9x <mattheu.9x@gmail.com>, 2012
+# saosangm <saosangmo@yahoo.com>, 2013
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -75,7 +79,7 @@ msgstr "Mã Token đã hết hạn. Hãy tải lại trang."
#: search/provider/file.php:17 search/provider/file.php:35
msgid "Files"
-msgstr "Táºp tin"
+msgstr "Các táºp tin"
#: search/provider/file.php:26 search/provider/file.php:33
msgid "Text"
@@ -113,79 +117,79 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
#: template.php:113
msgid "seconds ago"
-msgstr "và i giây trước"
+msgstr "1 giây trước"
#: template.php:114
msgid "1 minute ago"
@@ -235,6 +239,19 @@ msgstr "năm trước"
msgid "years ago"
msgstr "năm trước"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s có sẵn. <a href=\"%s\">xem thêm ở đây</a>"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "đến ngà y"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "đã TÄ‚T chức năng cáºp nháºt "
+
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index e491b49c01..649183dcf9 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <khanhnd@kenhgiaiphap.vn>, 2012.
+# <mattheu.9x@gmail.com>, 2012.
+# <mattheu_9x@yahoo.com>, 2012.
+# sao sang <saosangmo@yahoo.com>, 2013.
+# Son Nguyen <sonnghit@gmail.com>, 2012.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
+# <vlinhd11@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +28,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Không thể tải danh sách ứng dụng từ App Store"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Lỗi xác thực"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "Không thể thay đổi tên hiển thị"
@@ -120,9 +123,9 @@ msgstr "Lá»—i khi cáºp nháºt ứng dụng"
msgid "Updated"
msgstr "Äã cáºp nháºt"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "Äang lÆ°u..."
+msgstr "Äang tiến hà nh lÆ°u ..."
#: js/users.js:43
msgid "deleted"
@@ -136,16 +139,16 @@ msgstr "lùi lại"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "Xóa"
@@ -165,7 +168,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__Ngôn ngữ___"
@@ -235,59 +238,59 @@ msgstr ""
#: templates/admin.php:92
msgid "Cron"
-msgstr "Cron"
+msgstr ""
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "Thực thi tác vụ mỗi khi trang được tải"
+msgstr ""
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php đã được đăng ký tại má»™t dịch vụ webcron. Gá»i trang cron.php má»—i phút má»™t lần thông qua giao thức http."
+msgstr ""
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "Sá» dụng dịch vụ cron của hệ thống. Gá»i tệp tin cron.php má»—i phút má»™t lần."
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "Chia sẻ"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Báºt chia sẻ API"
+msgstr ""
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr "Cho phép các ứng dụng sỠdụng chia sẻ API"
+msgstr ""
#: templates/admin.php:142
msgid "Allow links"
-msgstr "Cho phép liên kết"
+msgstr ""
#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
-msgstr "Cho phép ngÆ°á»i dùng chia sẻ công khai các mục bằng các liên kết"
+msgstr ""
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr "Cho phép chia sẻ lại"
+msgstr ""
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
-msgstr "Cho phép ngÆ°á»i dùng chia sẻ lại những mục đã được chia sẻ"
+msgstr ""
#: templates/admin.php:158
msgid "Allow users to share with anyone"
-msgstr "Cho phép ngÆ°á»i dùng chia sẻ vá»›i bất cứ ai"
+msgstr ""
#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
-msgstr "Chỉ cho phép ngÆ°á»i dùng chia sẻ vá»›i những ngÆ°á»i dùng trong nhóm của há»"
+msgstr ""
#: templates/admin.php:168
msgid "Security"
@@ -310,25 +313,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "Log"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "hơn"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "Ãt"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +402,7 @@ msgstr "Nháºn ứng dụng để đồng bá»™ file của bạn"
msgid "Show First Run Wizard again"
msgstr "Hiện lại việc chạy đồ thuáºt khởi đầu"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Máºt khẩu"
@@ -417,76 +420,88 @@ msgstr "Máºt khẩu cÅ©"
#: templates/personal.php:42
msgid "New password"
-msgstr "Máºt khẩu má»›i"
+msgstr "Máºt khẩu má»›i "
#: templates/personal.php:44
msgid "Change password"
msgstr "Äổi máºt khẩu"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Tên hiển thị"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "Tên hiển thị của bạn đã được thay đổi"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "Không thể thay đổi tên hiển thị của bạn"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "Thay đổi tên hiển thị"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "Email"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Email của bạn"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Nháºp địa chỉ email của bạn để khôi phục lại máºt khẩu"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Ngôn ngữ"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Há»— trợ dịch thuáºt"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "SỠdụng địa chỉ nà y để kết nối ownCloud của bạn trong trình quản lý file của bạn"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "Tên đăng nháºp"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "Tạo"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "Bộ nhớ mặc định"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "Không giới hạn"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "Khác"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "Bá»™ nhá»›"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "Thay đổi tên hiển thị"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "đặt máºt khẩu má»›i"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 09d7c04c67..49365ead0b 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mattheu_9x@yahoo.com>, 2012.
+# sao sang <saosangmo@yahoo.com>, 2013.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 3722c01c65..b40e228844 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bluehattree@126.com>, 2012.
+# HO Gin Wang <kopisee@qq.com>, 2013.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -73,7 +76,7 @@ msgstr ""
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr "没有选ä¸è¦åˆ 除的分类。"
+msgstr "没有选者è¦åˆ 除的分类."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -243,7 +246,7 @@ msgstr "未指定对象类型。"
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr "出错"
+msgstr "错误"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
@@ -293,7 +296,7 @@ msgstr "分享链接"
msgid "Password protect"
msgstr "密ç ä¿æŠ¤"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "密ç "
@@ -396,27 +399,24 @@ msgstr "ç§æœ‰äº‘密ç é‡ç½®"
msgid "Use the following link to reset your password: {link}"
msgstr "使用下é¢çš„链接æ¥é‡ç½®ä½ 的密ç :{link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "ä½ å°†ä¼šæ”¶åˆ°ä¸€ä¸ªé‡ç½®å¯†ç 的链接"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "用户å"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "è¦æ±‚é‡ç½®"
@@ -438,7 +438,7 @@ msgstr "é‡ç½®å¯†ç "
#: strings.php:5
msgid "Personal"
-msgstr "ç§äºº"
+msgstr "个人的"
#: strings.php:6
msgid "Users"
@@ -446,11 +446,11 @@ msgstr "用户"
#: strings.php:7
msgid "Apps"
-msgstr "程åº"
+msgstr "应用程åº"
#: strings.php:8
msgid "Admin"
-msgstr "管ç†å‘˜"
+msgstr "管ç†"
#: strings.php:9
msgid "Help"
@@ -522,80 +522,75 @@ msgstr "进阶"
msgid "Data folder"
msgstr "æ•°æ®å˜æ”¾æ–‡ä»¶å¤¹"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "é…置数æ®åº“"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "将会使用"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "æ•°æ®åº“用户"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "æ•°æ®åº“密ç "
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "æ•°æ®åº“用户å"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "æ•°æ®åº“è¡¨æ ¼ç©ºé—´"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "æ•°æ®åº“主机"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "完æˆå®‰è£…"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "您控制的网络æœåŠ¡"
+msgstr "ä½ æŽ§åˆ¶ä¸‹çš„ç½‘ç»œæœåŠ¡"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "注销"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "自动登录被拒ç»ï¼"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "如果您最近没有修改您的密ç ，那您的å¸å·å¯èƒ½è¢«æ”»å‡»äº†ï¼"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "请修改您的密ç 以ä¿æŠ¤è´¦æˆ·ã€‚"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "忘记密ç ?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "备忘"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "登陆"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "备选登录"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index c2de52c995..e08b45e55c 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +39,7 @@ msgstr "æ²¡æœ‰ä¸Šä¼ æ–‡ä»¶ã€‚æœªçŸ¥é”™è¯¯"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "æ–‡ä»¶ä¸Šä¼ æˆåŠŸ"
+msgstr "没有任何错误,æ–‡ä»¶ä¸Šä¼ æˆåŠŸäº†"
#: ajax/upload.php:27
msgid ""
@@ -48,19 +50,19 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº† HTML è¡¨æ ¼ä¸æŒ‡å®šçš„ MAX_FILE_SIZE 选项"
+msgstr "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†HTML表å•æŒ‡å®šçš„MAX_FILE_SIZE"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "æ–‡ä»¶éƒ¨åˆ†ä¸Šä¼ "
+msgstr "文件åªæœ‰éƒ¨åˆ†è¢«ä¸Šä¼ "
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "æ²¡æœ‰ä¸Šä¼ æ–‡ä»¶"
+msgstr "æ²¡æœ‰ä¸Šä¼ å®Œæˆçš„文件"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "缺失临时文件夹"
+msgstr "丢失了一个临时文件夹"
#: ajax/upload.php:33
msgid "Failed to write to disk"
@@ -78,25 +80,21 @@ msgstr ""
msgid "Files"
msgstr "文件"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "分享"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "åˆ é™¤"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "é‡å‘½å"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "ç‰å¾…ä¸"
+msgstr "Pending"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -132,7 +130,7 @@ msgstr "1 个文件æ£åœ¨ä¸Šä¼ "
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "个文件æ£åœ¨ä¸Šä¼ "
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +162,7 @@ msgstr ""
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ä¸èƒ½ä¸Šä¼ 您的文件，由于它是文件夹或者为空文件"
+msgstr "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› 为它是个文件夹或者大å°ä¸º0"
#: js/files.js:272
msgid "Not enough space available"
@@ -193,7 +191,7 @@ msgstr "出错"
#: js/files.js:872 templates/index.php:70
msgid "Name"
-msgstr "å称"
+msgstr "åå—"
#: js/files.js:873 templates/index.php:81
msgid "Size"
@@ -293,11 +291,11 @@ msgstr "下载"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "å–消分享"
+msgstr "å–消共享"
#: templates/index.php:108
msgid "Upload too large"
-msgstr "ä¸Šä¼ è¿‡å¤§"
+msgstr "ä¸Šä¼ çš„æ–‡ä»¶å¤ªå¤§äº†"
#: templates/index.php:110
msgid ""
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 172dbb740f..878e5e2664 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 3ab0f8b002..d3602f8d94 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# HO Gin Wang <kopisee@qq.com>, 2013.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +39,19 @@ msgstr "请æ供一个有效的 Dropbox app key å’Œ secret。"
msgid "Error configuring Google Drive storage"
msgstr "é…ç½® Google Drive å˜å‚¨å¤±è´¥"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>注æ„：</b>“SMB客户端â€æœªå®‰è£…。CIFS/SMB分享ä¸å¯ç”¨ã€‚请å‘您的系统管ç†å‘˜è¯·æ±‚安装该客户端。"
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>注æ„：</b>PHPçš„FTP支æŒå°šæœªå¯ç”¨æˆ–未安装。FTP分享ä¸å¯ç”¨ã€‚请å‘您的系统管ç†å‘˜è¯·æ±‚安装。"
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "外部å˜å‚¨"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 61e2a5168a..08809924df 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 487b06cc01..1706c782c5 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 036989e088..346dfc9063 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# HO Gin Wang <kopisee@qq.com>, 2013.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 526d5f2461..b8451f60b6 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +114,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "å› WebDAV接å£æ•…障，您的网络æœåŠ¡å™¨å¥½åƒå¹¶æœªå…许文件åŒæ¥ã€‚"
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请åŒå‡»<a href='%s'>安装å‘导</a>。"
@@ -235,6 +236,19 @@ msgstr "去年"
msgid "years ago"
msgstr "å¹´å‰"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ä¸å¯ç”¨ã€‚获知 <a href=\"%s\">详情</a>"
+
+#: 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\""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 06965bd612..a259a909f5 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <bluehattree@126.com>, 2012.
+# HO Gin Wang <kopisee@qq.com>, 2013.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +24,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "ä¸èƒ½ä»ŽApp Store ä¸åŠ 载列表"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "验è¯é”™è¯¯"
+msgstr "认è¯é”™è¯¯"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "æ— æ³•æ›´æ”¹æ˜¾ç¤ºå称"
@@ -120,7 +119,7 @@ msgstr "应用å‡çº§æ—¶å‡ºçŽ°é”™è¯¯"
msgid "Updated"
msgstr "å·²å‡çº§"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "ä¿å˜ä¸..."
@@ -136,16 +135,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
-msgstr "群组"
+msgstr "组"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "群组管ç†å‘˜"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "åˆ é™¤"
@@ -165,7 +164,7 @@ msgstr "新增用户时出现错误"
msgid "A valid password must be provided"
msgstr "请填写有效密ç "
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Chinese"
@@ -239,23 +238,23 @@ msgstr "Cron"
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr "在æ¯ä¸ªé¡µé¢è½½å…¥æ—¶æ‰§è¡Œä¸€é¡¹ä»»åŠ¡"
+msgstr ""
#: templates/admin.php:111
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php 已作为 webcron æœåŠ¡æ³¨å†Œã€‚owncloud æ ¹ç”¨æˆ·å°†é€šè¿‡ http åè®®æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ cron.php。"
+msgstr ""
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr "使用系统 cron æœåŠ¡ã€‚通过系统 cronjob æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ owncloud 文件夹下的 cron.php"
+msgstr ""
#: templates/admin.php:128
msgid "Sharing"
-msgstr "分享"
+msgstr ""
#: templates/admin.php:134
msgid "Enable Share API"
@@ -310,25 +309,25 @@ msgstr ""
#: templates/admin.php:195
msgid "Log"
-msgstr "日志"
+msgstr ""
#: templates/admin.php:196
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "更多"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "æ›´å°‘"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "版本"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +398,7 @@ msgstr "获å–应用并åŒæ¥æ‚¨çš„文件"
msgid "Show First Run Wizard again"
msgstr "å†æ¬¡æ˜¾ç¤ºé¦–次è¿è¡Œå‘导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "密ç "
@@ -423,70 +422,82 @@ msgstr "新密ç "
msgid "Change password"
msgstr "改å˜å¯†ç "
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "显示å称"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "电å邮件"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "您的显示å称已修改"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "æ— æ³•ä¿®æ”¹æ‚¨çš„æ˜¾ç¤ºå称"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "更改显示å称"
#: templates/personal.php:70
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "ä½ çš„email地å€"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "输入一个邮箱地å€ä»¥æ¿€æ´»å¯†ç æ¢å¤åŠŸèƒ½"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "è¯è¨€"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "使用æ¤åœ°å€æ¥åœ¨æ‚¨çš„文件管ç†å™¨ä¸è¿žæŽ¥æ‚¨çš„ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "登录å"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "新建"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "默认容é‡"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "æ— é™åˆ¶"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
-msgstr "其他"
+msgstr "其他的"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "容é‡"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "更改显示å称"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "设置新的密ç "
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 0836d8955e..2de59e1c07 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 1b9c3c8856..8b0bba0a79 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# Phoenix Nemo <>, 2012.
+# <rainofchaos@gmail.com>, 2013.
+# <suiy02@gmail.com>, 2012.
+# <wengxt@gmail.com>, 2013.
+# <wengxt@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -259,7 +266,7 @@ msgstr "已共享"
#: js/share.js:90
msgid "Share"
-msgstr "分享"
+msgstr "共享"
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
@@ -283,7 +290,7 @@ msgstr " {owner}与您共享"
#: js/share.js:159
msgid "Share with"
-msgstr "分享之"
+msgstr "共享"
#: js/share.js:164
msgid "Share with link"
@@ -293,7 +300,7 @@ msgstr "共享链接"
msgid "Password protect"
msgstr "密ç ä¿æŠ¤"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "密ç "
@@ -396,27 +403,24 @@ msgstr "é‡ç½® ownCloud 密ç "
msgid "Use the following link to reset your password: {link}"
msgstr "使用以下链接é‡ç½®æ‚¨çš„密ç ：{link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "您将会收到包å«å¯ä»¥é‡ç½®å¯†ç 链接的邮件。"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "用户å"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "请求é‡ç½®"
@@ -450,7 +454,7 @@ msgstr "应用"
#: strings.php:8
msgid "Admin"
-msgstr "管ç†"
+msgstr "管ç†å‘˜"
#: strings.php:9
msgid "Help"
@@ -470,7 +474,7 @@ msgstr "编辑分类"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr "å¢žåŠ "
+msgstr "æ·»åŠ "
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -479,11 +483,11 @@ msgstr "安全è¦å‘Š"
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "ä½ çš„PHP版本容易å—到空å—节攻击 (CVE-2006-7243)"
+msgstr ""
#: templates/installation.php:26
msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "为ä¿è¯å®‰å…¨ä½¿ç”¨ ownCloud 请更新您的PHP。"
+msgstr ""
#: templates/installation.php:32
msgid ""
@@ -522,80 +526,75 @@ msgstr "高级"
msgid "Data folder"
msgstr "æ•°æ®ç›®å½•"
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "é…置数æ®åº“"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "将被使用"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "æ•°æ®åº“用户"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "æ•°æ®åº“密ç "
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "æ•°æ®åº“å"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr "æ•°æ®åº“表空间"
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr "æ•°æ®åº“主机"
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr "安装完æˆ"
#: templates/layout.guest.php:40
msgid "web services under your control"
-msgstr "您控制的webæœåŠ¡"
+msgstr "由您掌控的网络æœåŠ¡"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "注销"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "自动登录被拒ç»ï¼"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "如果您没有最近修改您的密ç ，您的å¸æˆ·å¯èƒ½ä¼šå—到影å“ï¼"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "请修改您的密ç ，以ä¿æŠ¤æ‚¨çš„账户安全。"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "忘记密ç ？"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
-msgstr "è®°ä½"
+msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "登录"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "其他登录方å¼"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 6f0626fc69..f16dc8ac1a 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
+# <rainofchaos@gmail.com>, 2012.
+# <suiy02@gmail.com>, 2012.
+# <wengxt@gmail.com>, 2013.
+# <wengxt@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +44,7 @@ msgstr "æ²¡æœ‰æ–‡ä»¶è¢«ä¸Šä¼ ã€‚æœªçŸ¥é”™è¯¯"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "æ–‡ä»¶ä¸Šä¼ æˆåŠŸï¼Œæ²¡æœ‰é”™è¯¯å‘生"
+msgstr "没有å‘ç”Ÿé”™è¯¯ï¼Œæ–‡ä»¶ä¸Šä¼ æˆåŠŸã€‚"
#: ajax/upload.php:27
msgid ""
@@ -48,15 +55,15 @@ msgstr "ä¸Šä¼ æ–‡ä»¶å¤§å°å·²è¶…过php.iniä¸upload_max_filesize所规定的值"
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "ä¸Šä¼ çš„æ–‡ä»¶é•¿åº¦è¶…å‡ºäº† HTML 表å•ä¸ MAX_FILE_SIZE çš„é™åˆ¶"
+msgstr "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†åœ¨HTML 表å•ä¸æŒ‡å®šçš„MAX_FILE_SIZE"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "å·²ä¸Šä¼ æ–‡ä»¶åªä¸Šä¼ 了部分（ä¸å®Œæ•´ï¼‰"
+msgstr "åªä¸Šä¼ 了文件的一部分"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "æ²¡æœ‰æ–‡ä»¶è¢«ä¸Šä¼ "
+msgstr "æ–‡ä»¶æ²¡æœ‰ä¸Šä¼ "
#: ajax/upload.php:32
msgid "Missing a temporary folder"
@@ -78,25 +85,21 @@ msgstr "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚"
msgid "Files"
msgstr "文件"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "分享"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "æ°¸ä¹…åˆ é™¤"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "åˆ é™¤"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "é‡å‘½å"
#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
msgid "Pending"
-msgstr "ç‰å¾…"
+msgstr "æ“作ç‰å¾…ä¸"
#: js/filelist.js:252 js/filelist.js:254
msgid "{new_name} already exists"
@@ -132,7 +135,7 @@ msgstr "1ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸"
#: js/filelist.js:409 js/filelist.js:463
msgid "files uploading"
-msgstr "æ–‡ä»¶ä¸Šä¼ ä¸"
+msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -164,7 +167,7 @@ msgstr "下载æ£åœ¨å‡†å¤‡ä¸ã€‚如果文件较大å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚
#: js/files.js:259
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "æ— æ³•ä¸Šä¼ æ‚¨çš„æ–‡ä»¶ï¼Œæ–‡ä»¶å¤¹æˆ–è€…ç©ºæ–‡ä»¶"
+msgstr "æ— æ³•ä¸Šä¼ æ–‡ä»¶ï¼Œå› ä¸ºå®ƒæ˜¯ä¸€ä¸ªç›®å½•æˆ–è€…å¤§å°ä¸º 0 å—节"
#: js/files.js:272
msgid "Not enough space available"
@@ -293,7 +296,7 @@ msgstr "下载"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "å–消共享"
+msgstr "å–消分享"
#: templates/index.php:108
msgid "Upload too large"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 9ececa5149..0b01ef9057 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# CyberCowBoy <ccb3275@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 4c1d4d64de..71015f5413 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +40,19 @@ msgstr "请æ供有效的Dropbox应用keyå’Œsecret"
msgid "Error configuring Google Drive storage"
msgstr "é…ç½®Google Driveå˜å‚¨æ—¶å‡ºé”™"
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>è¦å‘Šï¼š</b>“smbclient†尚未安装。CIFS/SMB åˆ†äº«æŒ‚è½½æ— æ³•å®žçŽ°ã€‚è¯·å’¨è¯¢ç³»ç»Ÿç®¡ç†å‘˜è¿›è¡Œå®‰è£…。"
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr "<b>è¦å‘Šï¼š</b>PHPä¸å°šæœªå¯ç”¨æˆ–安装FTP。FTP åˆ†äº«æŒ‚è½½æ— æ³•å®žçŽ°ã€‚è¯·å’¨è¯¢ç³»ç»Ÿç®¡ç†å‘˜è¿›è¡Œå®‰è£…。"
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>è¦å‘Šï¼š</b> PHPä¸æœªå¯ç”¨æˆ–未安装Curl支æŒã€‚ownCloud / WebDAV 或 GoogleDrive ä¸èƒ½æŒ‚载。请请求您的系统管ç†å‘˜å®‰è£…该它。"
-
#: templates/settings.php:3
msgid "External Storage"
msgstr "外部å˜å‚¨"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 32f5435899..f77a967602 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suiy02@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 3d23aa4013..51216ed592 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# CyberCowBoy <ccb3275@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index a01c8b41aa..d617fbb9d4 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# <cn.leoyang@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 27fe05a7de..ed930d2280 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# hanfeng <appweb.cn@gmail.com>, 2012
+# marguerite su <i@marguerite.su>, 2013
+# leonfeng <rainofchaos@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -113,83 +116,83 @@ msgstr "%s 您ä¸èƒ½åœ¨æ•°æ®åº“å称ä¸ä½¿ç”¨è‹±æ–‡å¥å·ã€‚"
msgid "%s set the database host."
msgstr "%s 设置数æ®åº“所在主机。"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "ä½ éœ€è¦è¾“入一个数æ®åº“ä¸å·²æœ‰çš„账户或管ç†å‘˜è´¦æˆ·ã€‚"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "æ•°æ®åº“错误：\"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "冲çªå‘½ä»¤ä¸ºï¼š\"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL 用户 '%s'@'localhost' å·²å˜åœ¨ã€‚"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "建议从 MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL 用户 '%s'@'%%' å·²å˜åœ¨"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "建议从 MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·ã€‚"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "冲çªå‘½ä»¤ä¸ºï¼š\"%s\"，å称：%s，密ç ：%s"
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 用户åå’Œ/或密ç æ— æ•ˆï¼š%s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…许文件åŒæ¥, å› ä¸ºWebDAV的接å£ä¼¼ä¹Žå·²æŸå."
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指å—</a>."
#: template.php:113
msgid "seconds ago"
-msgstr "秒å‰"
+msgstr "å‡ ç§’å‰"
#: template.php:114
msgid "1 minute ago"
-msgstr "一分钟å‰"
+msgstr "1分钟å‰"
#: template.php:115
#, php-format
@@ -233,7 +236,20 @@ msgstr "去年"
#: template.php:124
msgid "years ago"
-msgstr "å¹´å‰"
+msgstr "å‡ å¹´å‰"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s å·²å˜åœ¨ã€‚ç‚¹æ¤ <a href=\"%s\">获å–更多信æ¯</a>"
+
+#: 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
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7398714007..b00faa27fa 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# CyberCowBoy <ccb3275@gmail.com>, 2013.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012-2013.
+# Phoenix Nemo <>, 2012.
+# <rainofchaos@gmail.com>, 2012.
+# <suiy02@gmail.com>, 2012.
+# <wengxt@gmail.com>, 2013.
+# <wengxt@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +29,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "æ— æ³•ä»Žåº”ç”¨å•†åº—è½½å…¥åˆ—è¡¨"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "认è¯å‡ºé”™"
+msgstr "认è¯é”™è¯¯"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "æ— æ³•ä¿®æ”¹æ˜¾ç¤ºå称"
@@ -68,7 +72,7 @@ msgstr "è¯è¨€å·²ä¿®æ”¹"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr "æ— æ•ˆè¯·æ±‚"
+msgstr "éžæ³•è¯·æ±‚"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -98,7 +102,7 @@ msgstr "ç¦ç”¨"
#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
-msgstr "å¼€å¯"
+msgstr "å¯ç”¨"
#: js/apps.js:55
msgid "Please wait...."
@@ -120,9 +124,9 @@ msgstr "更新 app 时出错"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
-msgstr "ä¿å˜ä¸"
+msgstr "æ£åœ¨ä¿å˜"
#: js/users.js:43
msgid "deleted"
@@ -136,16 +140,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "组"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "组管ç†å‘˜"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "åˆ é™¤"
@@ -165,7 +169,7 @@ msgstr "创建用户出错"
msgid "A valid password must be provided"
msgstr "å¿…é¡»æä¾›åˆæ³•çš„密ç "
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "简体ä¸æ–‡"
@@ -316,19 +320,19 @@ msgstr "日志"
msgid "Log level"
msgstr "日志级别"
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr "更多"
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr "æ›´å°‘"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr "版本"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +403,7 @@ msgstr "安装应用进行文件åŒæ¥"
msgid "Show First Run Wizard again"
msgstr "å†æ¬¡æ˜¾ç¤ºé¦–次è¿è¡Œå‘导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "密ç "
@@ -423,70 +427,82 @@ msgstr "新密ç "
msgid "Change password"
msgstr "修改密ç "
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "显示å称"
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "您的显示å称已修改"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "æ— æ³•ä¿®æ”¹æ‚¨çš„æ˜¾ç¤ºå称"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "修改显示å称"
+
+#: templates/personal.php:70
msgid "Email"
msgstr "电å邮件"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr "您的电å邮件"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "填写电å邮件地å€ä»¥å¯ç”¨å¯†ç æ¢å¤åŠŸèƒ½"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "è¯è¨€"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "用该地å€æ¥è¿žæŽ¥æ–‡ä»¶ç®¡ç†å™¨ä¸çš„ ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "登录å称"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "创建"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "默认å˜å‚¨"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "æ— é™"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "其它"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "å˜å‚¨"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "修改显示å称"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "设置新密ç "
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 763966dd29..5b309314a9 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 524bd63e93..2d4729abd3 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <amanda.shuuemura@gmail.com>, 2012.
+# Dennis <dtsang29@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -293,7 +295,7 @@ msgstr "以連çµåˆ†äº«"
msgid "Password protect"
msgstr "密碼ä¿è·"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "密碼"
@@ -396,27 +398,24 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "請用以下連çµé‡è¨ä½ 的密碼: {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "ä½ å°‡æ”¶åˆ°ä¸€å°é›»éƒµ"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "用戶å稱"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "é‡è¨"
@@ -522,37 +521,37 @@ msgstr "進階"
msgid "Data folder"
msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:73
msgid "Configure the database"
msgstr "è¨å®šè³‡æ–™åº«"
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:78 templates/installation.php:90
+#: templates/installation.php:101 templates/installation.php:112
+#: templates/installation.php:124
msgid "will be used"
msgstr "將被使用"
-#: templates/installation.php:137
+#: templates/installation.php:136
msgid "Database user"
msgstr "資料庫帳戶"
-#: templates/installation.php:144
+#: templates/installation.php:143
msgid "Database password"
msgstr "資料庫密碼"
-#: templates/installation.php:149
+#: templates/installation.php:148
msgid "Database name"
msgstr "資料庫å稱"
-#: templates/installation.php:159
+#: templates/installation.php:158
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:166
+#: templates/installation.php:165
msgid "Database host"
msgstr ""
-#: templates/installation.php:172
+#: templates/installation.php:171
msgid "Finish setup"
msgstr ""
@@ -560,42 +559,37 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "登出"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "自動登入被拒"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "å¦‚æžœä½ è¿‘æœŸæœªæ›¾æ›´æ”¹å¯†ç¢¼, ä½ çš„å¸³è™Ÿå¯èƒ½è¢«æ´©éœ²!"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "è«‹æ›´æ”¹ä½ çš„å¯†ç¢¼ä»¥ä¿è·ä½ 的帳戶"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "忘記密碼"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "記ä½"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "登入"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index c309f0cffb..4bdea350bb 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <amanda.shuuemura@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -78,19 +79,15 @@ msgstr ""
msgid "Files"
msgstr "文件"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "分享"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "刪除"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 2cc250c386..e74b971e80 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dennis <dtsang29@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 1b8a3b8705..c58c75be33 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -37,26 +37,19 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
msgstr ""
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 3f73a185ad..323dd803c1 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 257a2b7d6d..a487e0d631 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index a26316004a..ee5d894d76 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dennis <dtsang29@hotmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index c47e2fd170..20c4b09967 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-04-18 02:04+0200\n"
+"PO-Revision-Date: 2013-04-18 00:05+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -113,72 +113,72 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -235,6 +235,19 @@ msgstr ""
msgid "years ago"
msgstr ""
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+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\""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 8f52891b9d..ed45045694 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-04-17 02:21+0200\n"
+"PO-Revision-Date: 2013-04-17 00:21+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr ""
@@ -120,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr ""
@@ -136,16 +132,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "群組"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "刪除"
@@ -165,7 +161,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
@@ -316,19 +312,19 @@ msgstr ""
msgid "Log level"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:223
msgid "More"
msgstr ""
-#: templates/admin.php:228
+#: templates/admin.php:224
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:231 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:234 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +395,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "密碼"
@@ -423,70 +419,82 @@ msgstr "新密碼"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
msgid "Email"
msgstr "電郵"
-#: templates/personal.php:70
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr ""
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 1ca7282410..c939df9acc 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 1191b8653f..83022879f3 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,13 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# admachen <admachen@gmail.com>, 2013
+# Hydriz <admin@alphacorp.tk>, 2013
+# Donahue Chuang <soshinwu@gmail.com>, 2012
+# dw4dev <dw4dev@gmail.com>, 2012
+# Ming Yi Wu <mingi.wu@gmail.com>, 2012
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 04:10+0000\n"
+"Last-Translator: admachen <admachen@gmail.com>\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"
@@ -174,7 +181,7 @@ msgstr "{minutes} 分é˜å‰"
#: js/js.js:721
msgid "1 hour ago"
-msgstr "1 å°æ™‚之å‰"
+msgstr "1 個å°æ™‚å‰"
#: js/js.js:722
msgid "{hours} hours ago"
@@ -293,7 +300,7 @@ msgstr "使用連çµåˆ†äº«"
msgid "Password protect"
msgstr "密碼ä¿è·"
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:169 templates/installation.php:54 templates/login.php:35
msgid "Password"
msgstr "密碼"
@@ -396,27 +403,24 @@ msgstr "ownCloud 密碼é‡è¨"
msgid "Use the following link to reset your password: {link}"
msgstr "請至以下連çµé‡è¨æ‚¨çš„密碼： {link}"
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
msgstr "é‡è¨å¯†ç¢¼çš„連çµå°‡æœƒå¯„åˆ°ä½ çš„é›»å郵件信箱。"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
+#: 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:48
+#: templates/login.php:28
msgid "Username"
msgstr "使用者å稱"
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:14
msgid "Request reset"
msgstr "請求é‡è¨"
@@ -450,11 +454,11 @@ msgstr "應用程å¼"
#: strings.php:8
msgid "Admin"
-msgstr "管ç†"
+msgstr "管ç†è€…"
#: strings.php:9
msgid "Help"
-msgstr "說明"
+msgstr "幫助"
#: templates/403.php:12
msgid "Access forbidden"
@@ -560,42 +564,37 @@ msgstr "完æˆè¨å®š"
msgid "web services under your control"
msgstr "由您控制的網路æœå‹™"
-#: templates/layout.user.php:36
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:61
+#: templates/layout.user.php:58
msgid "Log out"
msgstr "登出"
-#: templates/login.php:9
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "自動登入被拒ï¼"
-#: templates/login.php:10
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "如果您最近並未更改密碼，您的帳號å¯èƒ½å·²ç¶“é到入侵ï¼"
-#: templates/login.php:12
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "請更改您的密碼以å†æ¬¡å–得您帳戶的控制權。"
-#: templates/login.php:34
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "忘記密碼？"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "記ä½"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "登入"
-#: templates/login.php:47
+#: templates/login.php:49
msgid "Alternative Logins"
msgstr "替代登入方法"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index d4eeb6cbc2..3ef4705fcd 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -3,13 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# admachen <admachen@gmail.com>, 2013
+# Hydriz <admin@alphacorp.tk>, 2013
+# Donahue Chuang <soshinwu@gmail.com>, 2012
+# dw4dev <dw4dev@gmail.com>, 2012
+# Eddy Chang <taiwanmambo@gmail.com>, 2012
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# orinx <orinx@orinx.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# ywang <ywang1007@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:58+0200\n"
+"PO-Revision-Date: 2013-04-19 04:10+0000\n"
+"Last-Translator: admachen <admachen@gmail.com>\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"
@@ -78,19 +87,15 @@ msgstr "無效的資料夾。"
msgid "Files"
msgstr "檔案"
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "分享"
-
-#: js/fileactions.js:126
+#: js/fileactions.js:125
msgid "Delete permanently"
msgstr "永久刪除"
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "刪除"
-#: js/fileactions.js:194
+#: js/fileactions.js:193
msgid "Rename"
msgstr "é‡æ–°å‘½å"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index c9a6bba11a..23c337b856 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <admin@alphacorp.tk>, 2013.
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
+# ywang <ywang1007@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index e8d127b21b..2381134dcb 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# <admin@alphacorp.tk>, 2013.
+# <dw4dev@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 10:20+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +21,40 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
msgid "Access granted"
-msgstr "å…許å˜å–"
+msgstr "訪å•æ¬Šå·²è¢«å‡†è¨±"
#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
msgid "Error configuring Dropbox storage"
-msgstr "è¨å®š Dropbox 儲å˜æ™‚發生錯誤"
+msgstr ""
#: js/dropbox.js:65 js/google.js:66
msgid "Grant access"
-msgstr "å…許å˜å–"
+msgstr "准許訪å•æ¬Š"
#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
-msgstr "è«‹æ供有效的 Dropbox app key å’Œ app secret 。"
+msgstr ""
#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
-msgstr "è¨å®š Google Drive 儲å˜æ™‚發生錯誤"
+msgstr ""
-#: lib/config.php:431
+#: lib/config.php:424
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr "<b>è¦å‘Š</b>ï¼šæœªå®‰è£ \"smbclient\" ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ CIFS/SMB 分享，請洽您的系統管ç†å“¡å°‡å…¶å®‰è£ã€‚"
+msgstr ""
-#: lib/config.php:434
+#: lib/config.php:427
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr "<b>è¦å‘Š</b>：PHP 並未啓用 FTP 的支æ´ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ FTP 分享，請洽您的系統管ç†å“¡å°‡å…¶å®‰è£ä¸¦å•“用。"
-
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr "<b>è¦å‘Š</b>：PHP 並未啓用 Curl 的支æ´ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ ownCloud/WebDAV 或 Google Drive 分享，請洽您的系統管ç†å“¡å°‡å…¶å®‰è£ä¸¦å•“用。"
+msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr "外部儲å˜"
+msgstr "外部儲å˜è£ç½®"
#: templates/settings.php:9 templates/settings.php:28
msgid "Folder name"
@@ -68,7 +62,7 @@ msgstr "資料夾å稱"
#: templates/settings.php:10
msgid "External storage"
-msgstr "外部儲å˜"
+msgstr "外部儲å˜è£ç½®"
#: templates/settings.php:11
msgid "Configuration"
@@ -80,11 +74,11 @@ msgstr "é¸é …"
#: templates/settings.php:13
msgid "Applicable"
-msgstr "å¯ç”¨çš„"
+msgstr ""
#: templates/settings.php:33
msgid "Add storage"
-msgstr "å¢žåŠ å„²å˜å€"
+msgstr "æ·»åŠ å„²å˜å€"
#: templates/settings.php:90
msgid "None set"
@@ -109,15 +103,15 @@ msgstr "刪除"
#: templates/settings.php:129
msgid "Enable User External Storage"
-msgstr "啓用使用者外部儲å˜"
+msgstr ""
#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
-msgstr "å…許使用者自行掛載他們的外部儲å˜"
+msgstr ""
#: templates/settings.php:141
msgid "SSL root certificates"
-msgstr "SSL æ ¹æ†‘è‰"
+msgstr ""
#: templates/settings.php:159
msgid "Import Root Certificate"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 9ae606f6fa..81782aed68 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# pellaeon <nfsmwlin@gmail.com>, 2013
+# <dw4dev@gmail.com>, 2012.
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
+# <wu0809@msn.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 10:10+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,12 +31,12 @@ msgstr "é€å‡º"
#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
-msgstr "%s 和您分享了資料夾 %s "
+msgstr "%s 分享了資料夾 %s 給您"
#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
-msgstr "%s 和您分享了檔案 %s"
+msgstr "%s 分享了檔案 %s 給您"
#: templates/public.php:19 templates/public.php:43
msgid "Download"
@@ -46,4 +48,4 @@ msgstr "無法é 覽"
#: templates/public.php:50
msgid "web services under your control"
-msgstr "由您控制的網路æœå‹™"
+msgstr "在您掌控之下的網路æœå‹™"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index bc188ef03e..f903767b93 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hydriz <admin@alphacorp.tk>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 09:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 0269ee3c34..84176bd3b3 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <admin@alphacorp.tk>, 2013.
+# <dw4dev@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:22+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 71930d80bc..09c7e16617 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,13 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hydriz <admin@alphacorp.tk>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# sofiasu <sofia168@livemail.tw>, 2012
+# ywang <ywang1007@gmail.com>, 2012
+# ywang <ywang1007@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 09:00+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
@@ -113,72 +118,72 @@ msgstr "%s 資料庫å稱ä¸èƒ½åŒ…å«å°æ•¸é»ž"
msgid "%s set the database host."
msgstr "%s è¨å®šè³‡æ–™åº«ä¸»æ©Ÿã€‚"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:324 setup.php:369
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL 用戶åå’Œ/或密碼無效"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:156 setup.php:233
msgid "You need to enter either an existing account or the administrator."
msgstr "æ‚¨å¿…é ˆè¼¸å…¥ä¸€å€‹ç¾æœ‰çš„帳號或管ç†å“¡å¸³è™Ÿã€‚"
-#: setup.php:155 setup.php:458 setup.php:525
+#: setup.php:155 setup.php:457 setup.php:524
msgid "Oracle username and/or password not valid"
msgstr "Oracle 用戶åå’Œ/或密碼無效"
-#: setup.php:233
+#: setup.php:232
msgid "MySQL username and/or password not valid"
msgstr "MySQL 用戶åå’Œ/或密碼無效"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
+#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
+#: setup.php:614
#, php-format
msgid "DB Error: \"%s\""
msgstr "資料庫錯誤：\"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
+#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
+#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
#, php-format
msgid "Offending command was: \"%s\""
msgstr "有å•é¡Œçš„指令是：\"%s\""
-#: setup.php:304
+#: setup.php:303
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL 使用者 '%s'@'localhost' 已經å˜åœ¨ã€‚"
-#: setup.php:305
+#: setup.php:304
msgid "Drop this user from MySQL"
msgstr "在 MySQL 移除這個使用者"
-#: setup.php:310
+#: setup.php:309
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL 使用者 '%s'@'%%' 已經å˜åœ¨"
-#: setup.php:311
+#: setup.php:310
msgid "Drop this user from MySQL."
msgstr "在 MySQL 移除這個使用者。"
-#: setup.php:584 setup.php:616
+#: setup.php:583 setup.php:615
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "有å•é¡Œçš„指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
-#: setup.php:636
+#: setup.php:635
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 使用者和/或密碼無效：%s"
-#: setup.php:858
+#: setup.php:853
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的網é 伺æœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”案åŒæ¥ï¼Œå› 為您的 WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚"
-#: setup.php:859
+#: setup.php:854
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "è«‹åƒè€ƒ<a href='%s'>安è£æŒ‡å—</a>。"
@@ -235,6 +240,19 @@ msgstr "去年"
msgid "years ago"
msgstr "幾年å‰"
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s 已經å¯ç”¨ã€‚å–å¾— <a href=\"%s\">更多資訊</a>"
+
+#: 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\""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 9c5b7713d9..23cc130ca4 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -3,14 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hydriz <admin@alphacorp.tk>, 2013
+# Donahue Chuang <soshinwu@gmail.com>, 2012
+# dw4dev <dw4dev@gmail.com>, 2012
# pellaeon <nfsmwlin@gmail.com>, 2013
+# orinx <orinx@orinx.com>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# sy6614 <sy6614@yahoo.com.hk>, 2012
+# ronnietse <tseronnie@ymail.com>, 2013
+# weiyu <weiyu871@ms14.url.com.tw>, 2012
+# Jeff5555 <wu0809@msn.com>, 2012
+# ywang <ywang1007@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-04-20 01:59+0200\n"
+"PO-Revision-Date: 2013-04-19 09:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +32,12 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "無法從 App Store 讀å–清單"
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "èªè‰éŒ¯èª¤"
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr "已更改顯示å稱"
-
-#: ajax/changedisplayname.php:34
+#: ajax/changedisplayname.php:32
msgid "Unable to change display name"
msgstr "無法更改顯示å稱"
@@ -121,7 +127,7 @@ msgstr "更新應用程å¼éŒ¯èª¤"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:118
+#: js/personal.js:109
msgid "Saving..."
msgstr "儲å˜ä¸..."
@@ -137,16 +143,16 @@ msgstr "復原"
msgid "Unable to remove user"
msgstr "無法刪除用戶"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:88 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
msgid "Groups"
msgstr "群組"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:91 templates/users.php:82 templates/users.php:119
msgid "Group Admin"
msgstr "群組 管ç†å“¡"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:111 templates/users.php:161
msgid "Delete"
msgstr "刪除"
@@ -166,7 +172,7 @@ msgstr "創建用戶時出ç¾éŒ¯èª¤"
msgid "A valid password must be provided"
msgstr "一定è¦æ供一個有效的密碼"
-#: personal.php:35 personal.php:36
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__語言_å稱__"
@@ -246,7 +252,7 @@ msgstr "當é é¢è¼‰å…¥æ™‚，執行"
msgid ""
"cron.php is registered at a webcron service. Call the cron.php page in the "
"owncloud root once a minute over http."
-msgstr "cron.php 已經在 webcron æœå‹™ç•¶ä¸è¨»å†Šï¼Œè«‹æ¯åˆ†é˜é€éŽ HTTP å‘¼å« ownCloud æ ¹ç›®éŒ„ç•¶ä¸çš„ cron.php 一次。"
+msgstr ""
#: templates/admin.php:121
msgid ""
@@ -325,11 +331,11 @@ msgstr "更多"
msgid "Less"
msgstr "å°‘"
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:102
msgid "Version"
msgstr "版本"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:238 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -394,13 +400,13 @@ msgstr "您已經使用了 <strong>%s</strong> ，目å‰å¯ç”¨ç©ºé–“為 <strong>
#: templates/personal.php:15
msgid "Get the apps to sync your files"
-msgstr "下載應用程å¼ä¾†åŒæ¥æ‚¨çš„檔案"
+msgstr "ç²å–那些åŒæ¥æ‚¨çš„文件的應用程åº"
#: templates/personal.php:26
msgid "Show First Run Wizard again"
msgstr "å†æ¬¡é¡¯ç¤ºé¦–次使用精éˆ"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "密碼"
@@ -424,70 +430,82 @@ msgstr "新密碼"
msgid "Change password"
msgstr "變更密碼"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "顯示å稱"
-#: templates/personal.php:68
-msgid "Email"
-msgstr "ä¿¡ç®±"
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr "已更改顯示å稱"
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr "無法更改您的顯示å稱"
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr "更改顯示å稱"
#: templates/personal.php:70
+msgid "Email"
+msgstr "é›»å郵件"
+
+#: templates/personal.php:72
msgid "Your email address"
msgstr "您的電å郵件信箱"
-#: templates/personal.php:71
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "請填入電å郵件信箱以便回復密碼"
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "語言"
-#: templates/personal.php:89
+#: templates/personal.php:86
msgid "Help translate"
msgstr "幫助翻è¯"
-#: templates/personal.php:94
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:96
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "在您的檔案管ç†å“¡ä¸ä½¿ç”¨é€™å€‹åœ°å€ä¾†é€£ç·šåˆ° ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:77
msgid "Login Name"
msgstr "登入å稱"
-#: templates/users.php:30
+#: templates/users.php:32
msgid "Create"
msgstr "建立"
-#: templates/users.php:33
+#: templates/users.php:35
msgid "Default Storage"
msgstr "é è¨å„²å˜å€"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:41 templates/users.php:139
msgid "Unlimited"
msgstr "ç„¡é™åˆ¶"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
msgstr "其他"
-#: templates/users.php:82
+#: templates/users.php:84
msgid "Storage"
msgstr "儲å˜å€"
-#: templates/users.php:93
+#: templates/users.php:95
msgid "change display name"
msgstr "修改顯示å稱"
-#: templates/users.php:97
+#: templates/users.php:99
msgid "set new password"
msgstr "è¨å®šæ–°å¯†ç¢¼"
-#: templates/users.php:128
+#: templates/users.php:134
msgid "Default"
msgstr "é è¨"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 87daf4265b..e777005a3c 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <dw4dev@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-04-17 02:20+0200\n"
+"PO-Revision-Date: 2013-04-17 00:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/api.php b/lib/api.php
index 249d7a9035..8d6bbb7cc0 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -89,7 +89,7 @@ class OC_API {
$responses = array();
foreach(self::$actions[$name] as $action) {
// Check authentication and availability
- if(!self::isAuthorised($action)) {
+ if(!self::isAuthorised(self::$actions[$name])) {
$responses[] = array(
'app' => $action['app'],
'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'),
@@ -155,11 +155,11 @@ class OC_API {
// They may have failed for different reasons (different status codes)
// Which reponse code should we return?
// Maybe any that are not OC_API::RESPOND_SERVER_ERROR
- $response = reset($shipped['failed']);
+ $response = $shipped['failed'][0];
return $response;
} else {
// Return the third party failure result
- $response = reset($thirdparty['failed']);
+ $response = $thirdparty['failed'][0];
return $response;
}
// Merge the successful responses
diff --git a/lib/base.php b/lib/base.php
index 8633ae9b63..7b0967df9f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -97,15 +97,8 @@ class OC {
$path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
} elseif (strpos($className, 'OCA\\') === 0) {
foreach (self::$APPSROOTS as $appDir) {
- $path = strtolower(str_replace('\\', '/', substr($className, 4)) . '.php');
- $fullPath = stream_resolve_include_path($appDir['path'] . '/' . $path);
- if (file_exists($fullPath)) {
- require_once $fullPath;
- return false;
- }
- // If not found in the root of the app directory, insert '/lib' after app id and try again.
- $libpath = substr($path, 0, strpos($path, '/')) . '/lib' . substr($path, strpos($path, '/'));
- $fullPath = stream_resolve_include_path($appDir['path'] . '/' . $libpath);
+ $path = $appDir['path'] . '/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ $fullPath = stream_resolve_include_path($path);
if (file_exists($fullPath)) {
require_once $fullPath;
return false;
@@ -474,13 +467,11 @@ class OC {
stream_wrapper_register('close', 'OC\Files\Stream\Close');
stream_wrapper_register('oc', 'OC\Files\Stream\OC');
- self::initTemplateEngine();
self::checkConfig();
self::checkInstalled();
self::checkSSL();
- if ( !self::$CLI ) {
- self::initSession();
- }
+ self::initSession();
+ self::initTemplateEngine();
$errors = OC_Util::checkServer();
if (count($errors) > 0) {
@@ -640,13 +631,8 @@ class OC {
// Handle redirect URL for logged in users
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
-
- // Deny the redirect if the URL contains a @
- // This prevents unvalidated redirects like ?redirect_url=:user@domain.com
- if (strpos($location, '@') === FALSE) {
- header('Location: ' . $location);
- return;
- }
+ header('Location: ' . $location);
+ return;
}
// Handle WebDAV
if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 76a23c2573..4e32ff2ba8 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -30,9 +30,11 @@ class Cache {
private $storageId;
/**
- * @var Storage $storageCache
+ * numeric storage id
+ *
+ * @var int $numericId
*/
- private $storageCache;
+ private $numericId;
private $mimetypeIds = array();
private $mimetypes = array();
@@ -50,11 +52,19 @@ class Cache {
$this->storageId = md5($this->storageId);
}
- $this->storageCache = new Storage($storage);
+ $query = \OC_DB::prepare('SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?');
+ $result = $query->execute(array($this->storageId));
+ if ($row = $result->fetchRow()) {
+ $this->numericId = $row['numeric_id'];
+ } else {
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*storages`(`id`) VALUES(?)');
+ $query->execute(array($this->storageId));
+ $this->numericId = \OC_DB::insertid('*PREFIX*storages');
+ }
}
public function getNumericStorageId() {
- return $this->storageCache->getNumericId();
+ return $this->numericId;
}
/**
@@ -101,7 +111,7 @@ class Cache {
public function get($file) {
if (is_string($file) or $file == '') {
$where = 'WHERE `storage` = ? AND `path_hash` = ?';
- $params = array($this->getNumericStorageId(), md5($file));
+ $params = array($this->numericId, md5($file));
} else { //file id
$where = 'WHERE `fileid` = ?';
$params = array($file);
@@ -189,14 +199,14 @@ class Cache {
list($queryParts, $params) = $this->buildParts($data);
$queryParts[] = '`storage`';
- $params[] = $this->getNumericStorageId();
+ $params[] = $this->numericId;
$valuesPlaceholder = array_fill(0, count($queryParts), '?');
$query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')'
. ' VALUES(' . implode(', ', $valuesPlaceholder) . ')');
$result = $query->execute($params);
if (\OC_DB::isError($result)) {
- \OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result, \OCP\Util::ERROR);
+ \OCP\Util::writeLog('cache', 'Insert to cache failed: '.$result, \OCP\Util::ERROR);
}
return (int)\OC_DB::insertid('*PREFIX*filecache');
@@ -255,7 +265,7 @@ class Cache {
$pathHash = md5($file);
$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
- $result = $query->execute(array($this->getNumericStorageId(), $pathHash));
+ $result = $query->execute(array($this->numericId, $pathHash));
if ($row = $result->fetchRow()) {
return $row['fileid'];
@@ -344,7 +354,7 @@ class Cache {
*/
public function clear() {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE storage = ?');
- $query->execute(array($this->getNumericStorageId()));
+ $query->execute(array($this->numericId));
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*storages` WHERE id = ?');
$query->execute(array($this->storageId));
@@ -358,7 +368,7 @@ class Cache {
public function getStatus($file) {
$pathHash = md5($file);
$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
- $result = $query->execute(array($this->getNumericStorageId(), $pathHash));
+ $result = $query->execute(array($this->numericId, $pathHash));
if ($row = $result->fetchRow()) {
if ((int)$row['size'] === -1) {
return self::SHALLOW;
@@ -385,7 +395,7 @@ class Cache {
SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'
);
- $result = $query->execute(array($pattern, $this->getNumericStorageId()));
+ $result = $query->execute(array($pattern, $this->numericId));
$files = array();
while ($row = $result->fetchRow()) {
$row['mimetype'] = $this->getMimetype($row['mimetype']);
@@ -412,7 +422,7 @@ class Cache {
FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?'
);
$mimetype = $this->getMimetypeId($mimetype);
- $result = $query->execute(array($mimetype, $this->getNumericStorageId()));
+ $result = $query->execute(array($mimetype, $this->numericId));
$files = array();
while ($row = $result->fetchRow()) {
$row['mimetype'] = $this->getMimetype($row['mimetype']);
@@ -431,7 +441,7 @@ class Cache {
$this->calculateFolderSize($path);
if ($path !== '') {
$parent = dirname($path);
- if ($parent === '.' or $parent === '/') {
+ if ($parent === '.') {
$parent = '';
}
$this->correctFolderSize($parent);
@@ -450,7 +460,7 @@ class Cache {
return 0;
}
$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?');
- $result = $query->execute(array($id, $this->getNumericStorageId()));
+ $result = $query->execute(array($id, $this->numericId));
$totalSize = 0;
$hasChilds = 0;
while ($row = $result->fetchRow()) {
@@ -477,7 +487,7 @@ class Cache {
*/
public function getAll() {
$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?');
- $result = $query->execute(array($this->getNumericStorageId()));
+ $result = $query->execute(array($this->numericId));
$ids = array();
while ($row = $result->fetchRow()) {
$ids[] = $row['fileid'];
@@ -497,7 +507,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');
- $result = $query->execute(array($this->getNumericStorageId()));
+ $result = $query->execute(array($this->numericId));
if ($row = $result->fetchRow()) {
return $row['path'];
} else {
@@ -508,7 +518,6 @@ class Cache {
/**
* get the storage id of the storage for a file and the internal path of the file
*
- * @param int $id
* @return array, first element holding the storage id, second the path
*/
static public function getById($id) {
@@ -521,8 +530,10 @@ class Cache {
return null;
}
- if ($id = Storage::getStorageId($numericId)) {
- return array($id, $path);
+ $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
+ $result = $query->execute(array($numericId));
+ if ($row = $result->fetchRow()) {
+ return array($row['id'], $path);
} else {
return null;
}
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 5241acec1e..f019d4fc60 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -68,7 +68,7 @@ class Scanner {
if ($data) {
if ($file) {
$parent = dirname($file);
- if ($parent === '.' or $parent === '/') {
+ if ($parent === '.') {
$parent = '';
}
if (!$this->cache->inCache($parent)) {
diff --git a/lib/files/cache/storage.php b/lib/files/cache/storage.php
deleted file mode 100644
index 72de376798..0000000000
--- a/lib/files/cache/storage.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Files\Cache;
-
-/**
- * Class Storage
- *
- * cache storage specific data
- *
- * @package OC\Files\Cache
- */
-class Storage {
- private $storageId;
- private $numericId;
-
- /**
- * @param \OC\Files\Storage\Storage|string $storage
- */
- public function __construct($storage) {
- if ($storage instanceof \OC\Files\Storage\Storage) {
- $this->storageId = $storage->getId();
- } 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));
- if ($row = $result->fetchRow()) {
- $this->numericId = $row['numeric_id'];
- } else {
- $query = \OC_DB::prepare('INSERT INTO `*PREFIX*storages`(`id`) VALUES(?)');
- $query->execute(array($this->storageId));
- $this->numericId = \OC_DB::insertid('*PREFIX*storages');
- }
- }
-
- public function getNumericId() {
- return $this->numericId;
- }
-
- public static function getStorageId($numericId) {
- $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
- $result = $query->execute(array($numericId));
- if ($row = $result->fetchRow()) {
- return $row['id'];
- } else {
- return null;
- }
- }
-}
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 467973f09d..c0e9d215fb 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -34,11 +34,6 @@ const FREE_SPACE_UNKNOWN = -2;
const FREE_SPACE_UNLIMITED = -3;
class Filesystem {
- /**
- * @var Mount\Manager $mounts
- */
- private static $mounts;
-
public static $loaded = false;
/**
* @var \OC\Files\View $defaultInstance
@@ -152,7 +147,7 @@ class Filesystem {
* @return string
*/
static public function getMountPoint($path) {
- $mount = self::$mounts->find($path);
+ $mount = Mount::find($path);
if ($mount) {
return $mount->getMountPoint();
} else {
@@ -168,7 +163,7 @@ class Filesystem {
*/
static public function getMountPoints($path) {
$result = array();
- $mounts = self::$mounts->findIn($path);
+ $mounts = Mount::findIn($path);
foreach ($mounts as $mount) {
$result[] = $mount->getMountPoint();
}
@@ -182,26 +177,10 @@ class Filesystem {
* @return \OC\Files\Storage\Storage
*/
public static function getStorage($mountPoint) {
- $mount = self::$mounts->find($mountPoint);
+ $mount = Mount::find($mountPoint);
return $mount->getStorage();
}
- /**
- * @param $id
- * @return Mount\Mount[]
- */
- public static function getMountByStorageId($id) {
- return self::$mounts->findByStorageId($id);
- }
-
- /**
- * @param $id
- * @return Mount\Mount[]
- */
- public static function getMountByNumericId($id) {
- return self::$mounts->findByStorageId($id);
- }
-
/**
* resolve a path to a storage and internal path
*
@@ -209,7 +188,7 @@ class Filesystem {
* @return array consisting of the storage and the internal path
*/
static public function resolvePath($path) {
- $mount = self::$mounts->find($path);
+ $mount = Mount::find($path);
if ($mount) {
return array($mount->getStorage(), $mount->getInternalPath($path));
} else {
@@ -222,7 +201,6 @@ class Filesystem {
return false;
}
self::$defaultInstance = new View($root);
- self::$mounts = new Mount\Manager();
//load custom mount config
self::initMountPoints($user);
@@ -232,10 +210,6 @@ class Filesystem {
return true;
}
- static public function initMounts(){
- self::$mounts = new Mount\Manager();
- }
-
/**
* Initialize system and personal mount points for a user
*
@@ -353,7 +327,7 @@ class Filesystem {
* clear all mounts and storage backends
*/
public static function clearMounts() {
- self::$mounts->clear();
+ Mount::clear();
}
/**
@@ -364,8 +338,7 @@ class Filesystem {
* @param string $mountpoint
*/
static public function mount($class, $arguments, $mountpoint) {
- $mount = new Mount\Mount($class, $mountpoint, $arguments);
- self::$mounts->addMount($mount);
+ new Mount($class, $mountpoint, $arguments);
}
/**
diff --git a/lib/files/mount/mount.php b/lib/files/mount.php
similarity index 54%
rename from lib/files/mount/mount.php
rename to lib/files/mount.php
index 69b8285ab4..59c98e9dcc 100644
--- a/lib/files/mount/mount.php
+++ b/lib/files/mount.php
@@ -6,12 +6,13 @@
* See the COPYING-README file.
*/
-namespace OC\Files\Mount;
-
-use \OC\Files\Filesystem;
+namespace OC\Files;
class Mount {
-
+ /**
+ * @var Mount[]
+ */
+ static private $mounts = array();
/**
* @var \OC\Files\Storage\Storage $storage
@@ -32,7 +33,7 @@ class Mount {
$arguments = array();
}
- $mountpoint = $this->formatPath($mountpoint);
+ $mountpoint = self::formatPath($mountpoint);
if ($storage instanceof \OC\Files\Storage\Storage) {
$this->class = get_class($storage);
$this->storage = $storage;
@@ -45,6 +46,8 @@ class Mount {
$this->arguments = $arguments;
}
$this->mountPoint = $mountpoint;
+
+ self::$mounts[$this->mountPoint] = $this;
}
/**
@@ -55,8 +58,6 @@ class Mount {
}
/**
- * create the storage that is mounted
- *
* @return \OC\Files\Storage\Storage
*/
private function createStorage() {
@@ -120,11 +121,100 @@ class Mount {
* @param string $path
* @return string
*/
- private function formatPath($path) {
+ private static function formatPath($path) {
$path = Filesystem::normalizePath($path);
if (strlen($path) > 1) {
$path .= '/';
}
return $path;
}
+
+ /**
+ * Find the mount for $path
+ *
+ * @param $path
+ * @return Mount
+ */
+ public static function find($path) {
+ $path = self::formatPath($path);
+ if (isset(self::$mounts[$path])) {
+ return self::$mounts[$path];
+ }
+
+ \OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
+ $foundMountPoint = '';
+ $mountPoints = array_keys(self::$mounts);
+ foreach ($mountPoints as $mountpoint) {
+ if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
+ $foundMountPoint = $mountpoint;
+ }
+ }
+ if (isset(self::$mounts[$foundMountPoint])) {
+ return self::$mounts[$foundMountPoint];
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Find all mounts in $path
+ *
+ * @param $path
+ * @return Mount[]
+ */
+ public static function findIn($path) {
+ $path = self::formatPath($path);
+ $result = array();
+ $pathLength = strlen($path);
+ $mountPoints = array_keys(self::$mounts);
+ foreach ($mountPoints as $mountPoint) {
+ if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
+ $result[] = self::$mounts[$mountPoint];
+ }
+ }
+ return $result;
+ }
+
+ public static function clear() {
+ self::$mounts = array();
+ }
+
+ /**
+ * Find mounts by storage id
+ *
+ * @param string $id
+ * @return Mount[]
+ */
+ public static function findByStorageId($id) {
+ if (strlen($id) > 64) {
+ $id = md5($id);
+ }
+ $result = array();
+ foreach (self::$mounts as $mount) {
+ if ($mount->getStorageId() === $id) {
+ $result[] = $mount;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Find mounts by numeric storage id
+ *
+ * @param string $id
+ * @return Mount
+ */
+ public static function findByNumericId($id) {
+ $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
+ $result = $query->execute(array($id))->fetchOne();
+ if ($result) {
+ $id = $result;
+ foreach (self::$mounts as $mount) {
+ if ($mount->getStorageId() === $id) {
+ return $mount;
+ }
+ }
+ }
+ return false;
+ }
}
diff --git a/lib/files/mount/manager.php b/lib/files/mount/manager.php
deleted file mode 100644
index 25a5fe241c..0000000000
--- a/lib/files/mount/manager.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Files\Mount;
-
-use \OC\Files\Filesystem;
-
-class Manager {
- /**
- * @var Mount[]
- */
- private $mounts = array();
-
- /**
- * @param Mount $mount
- */
- public function addMount($mount) {
- $this->mounts[$mount->getMountPoint()] = $mount;
- }
-
- /**
- * Find the mount for $path
- *
- * @param $path
- * @return Mount
- */
- public function find($path) {
- \OC_Util::setupFS();
- $path = $this->formatPath($path);
- if (isset($this->mounts[$path])) {
- return $this->mounts[$path];
- }
-
- \OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
- $foundMountPoint = '';
- $mountPoints = array_keys($this->mounts);
- foreach ($mountPoints as $mountpoint) {
- if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
- $foundMountPoint = $mountpoint;
- }
- }
- if (isset($this->mounts[$foundMountPoint])) {
- return $this->mounts[$foundMountPoint];
- } else {
- return null;
- }
- }
-
- /**
- * Find all mounts in $path
- *
- * @param $path
- * @return Mount[]
- */
- public function findIn($path) {
- \OC_Util::setupFS();
- $path = $this->formatPath($path);
- $result = array();
- $pathLength = strlen($path);
- $mountPoints = array_keys($this->mounts);
- foreach ($mountPoints as $mountPoint) {
- if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
- $result[] = $this->mounts[$mountPoint];
- }
- }
- return $result;
- }
-
- public function clear() {
- $this->mounts = array();
- }
-
- /**
- * Find mounts by storage id
- *
- * @param string $id
- * @return Mount[]
- */
- public function findByStorageId($id) {
- \OC_Util::setupFS();
- if (strlen($id) > 64) {
- $id = md5($id);
- }
- $result = array();
- foreach ($this->mounts as $mount) {
- if ($mount->getStorageId() === $id) {
- $result[] = $mount;
- }
- }
- return $result;
- }
-
- /**
- * Find mounts by numeric storage id
- *
- * @param string $id
- * @return Mount
- */
- public function findByNumericId($id) {
- $storageId = \OC\Files\Cache\Storage::getStorageId($id);
- return $this->findByStorageId($storageId);
- }
-
- /**
- * @param string $path
- * @return string
- */
- private function formatPath($path) {
- $path = Filesystem::normalizePath($path);
- if (strlen($path) > 1) {
- $path .= '/';
- }
- return $path;
- }
-}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index e87fe3b523..38fe5e546f 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -25,7 +25,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
private $scanner;
private $permissioncache;
private $watcher;
- private $storageCache;
public function __construct($parameters) {
}
@@ -301,13 +300,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
return $this->watcher;
}
- public function getStorageCache(){
- if (!isset($this->storageCache)) {
- $this->storageCache = new \OC\Files\Cache\Storage($this);
- }
- return $this->storageCache;
- }
-
/**
* get the owner of a path
*
@@ -369,7 +361,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
* get the free space in the storage
*
* @param $path
- * @return int
+ * return int
*/
public function free_space($path) {
return \OC\Files\FREE_SPACE_UNKNOWN;
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index d684905bf9..81e32587fc 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -14,277 +14,252 @@ if (\OC_Util::runningOnWindows()) {
}
} else {
- /**
- * for local filestore, we only have to map the paths
- */
- class Local extends \OC\Files\Storage\Common {
- protected $datadir;
-
- public function __construct($arguments) {
- $this->datadir = $arguments['datadir'];
- if (substr($this->datadir, -1) !== '/') {
- $this->datadir .= '/';
- }
- }
-
- public function __destruct() {
- }
-
- public function getId() {
- return 'local::' . $this->datadir;
- }
-
- public function mkdir($path) {
- return @mkdir($this->datadir . $path);
- }
-
- public function rmdir($path) {
- return @rmdir($this->datadir . $path);
+/**
+ * for local filestore, we only have to map the paths
+ */
+class Local extends \OC\Files\Storage\Common{
+ protected $datadir;
+ public function __construct($arguments) {
+ $this->datadir=$arguments['datadir'];
+ if(substr($this->datadir, -1)!=='/') {
+ $this->datadir.='/';
}
-
- public function opendir($path) {
- return opendir($this->datadir . $path);
+ }
+ public function __destruct() {
+ }
+ public function getId(){
+ return 'local::'.$this->datadir;
+ }
+ public function mkdir($path) {
+ return @mkdir($this->datadir.$path);
+ }
+ public function rmdir($path) {
+ return @rmdir($this->datadir.$path);
+ }
+ public function opendir($path) {
+ return opendir($this->datadir.$path);
+ }
+ public function is_dir($path) {
+ if(substr($path, -1)=='/') {
+ $path=substr($path, 0, -1);
}
+ return is_dir($this->datadir.$path);
+ }
+ public function is_file($path) {
+ return is_file($this->datadir.$path);
+ }
+ public function stat($path) {
+ $fullPath = $this->datadir . $path;
+ $statResult = stat($fullPath);
- public function is_dir($path) {
- if (substr($path, -1) == '/') {
- $path = substr($path, 0, -1);
- }
- return is_dir($this->datadir . $path);
+ if ($statResult['size'] < 0) {
+ $size = self::getFileSizeFromOS($fullPath);
+ $statResult['size'] = $size;
+ $statResult[7] = $size;
}
-
- public function is_file($path) {
- return is_file($this->datadir . $path);
+ return $statResult;
+ }
+ public function filetype($path) {
+ $filetype=filetype($this->datadir.$path);
+ if($filetype=='link') {
+ $filetype=filetype(realpath($this->datadir.$path));
}
-
- public function stat($path) {
+ return $filetype;
+ }
+ public function filesize($path) {
+ if($this->is_dir($path)) {
+ return 0;
+ }else{
$fullPath = $this->datadir . $path;
- $statResult = stat($fullPath);
-
- if ($statResult['size'] < 0) {
- $size = self::getFileSizeFromOS($fullPath);
- $statResult['size'] = $size;
- $statResult[7] = $size;
+ $fileSize = filesize($fullPath);
+ if ($fileSize < 0) {
+ return self::getFileSizeFromOS($fullPath);
}
- return $statResult;
- }
- public function filetype($path) {
- $filetype = filetype($this->datadir . $path);
- if ($filetype == 'link') {
- $filetype = filetype(realpath($this->datadir . $path));
- }
- return $filetype;
+ return $fileSize;
}
-
- public function filesize($path) {
- if ($this->is_dir($path)) {
- return 0;
- } else {
- $fullPath = $this->datadir . $path;
- $fileSize = filesize($fullPath);
- if ($fileSize < 0) {
- return self::getFileSizeFromOS($fullPath);
- }
-
- return $fileSize;
- }
- }
-
- public function isReadable($path) {
- return is_readable($this->datadir . $path);
- }
-
- public function isUpdatable($path) {
- return is_writable($this->datadir . $path);
+ }
+ public function isReadable($path) {
+ return is_readable($this->datadir.$path);
+ }
+ public function isUpdatable($path) {
+ return is_writable($this->datadir.$path);
+ }
+ public function file_exists($path) {
+ return file_exists($this->datadir.$path);
+ }
+ public function filemtime($path) {
+ return filemtime($this->datadir.$path);
+ }
+ public function touch($path, $mtime=null) {
+ // sets the modification time of the file to the given value.
+ // If mtime is nil the current time is set.
+ // note that the access time of the file always changes to the current time.
+ if($this->file_exists($path) and !$this->isUpdatable($path)) {
+ return false;
}
-
- public function file_exists($path) {
- return file_exists($this->datadir . $path);
+ if(!is_null($mtime)) {
+ $result=touch( $this->datadir.$path, $mtime );
+ }else{
+ $result=touch( $this->datadir.$path);
}
-
- public function filemtime($path) {
- return filemtime($this->datadir . $path);
+ if( $result ) {
+ clearstatcache( true, $this->datadir.$path );
}
- public function touch($path, $mtime = null) {
- // sets the modification time of the file to the given value.
- // If mtime is nil the current time is set.
- // note that the access time of the file always changes to the current time.
- if ($this->file_exists($path) and !$this->isUpdatable($path)) {
- return false;
- }
- if (!is_null($mtime)) {
- $result = touch($this->datadir . $path, $mtime);
- } else {
- $result = touch($this->datadir . $path);
- }
- if ($result) {
- clearstatcache(true, $this->datadir . $path);
- }
-
- return $result;
+ return $result;
+ }
+ public function file_get_contents($path) {
+ return file_get_contents($this->datadir.$path);
+ }
+ public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
+ return file_put_contents($this->datadir.$path, $data);
+ }
+ public function unlink($path) {
+ return $this->delTree($path);
+ }
+ public function rename($path1, $path2) {
+ if (!$this->isUpdatable($path1)) {
+ \OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, \OC_Log::ERROR);
+ return false;
}
-
- public function file_get_contents($path) {
- return file_get_contents($this->datadir . $path);
+ if(! $this->file_exists($path1)) {
+ \OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, \OC_Log::ERROR);
+ return false;
}
- public function file_put_contents($path, $data) { //trigger_error("$path = ".var_export($path, 1));
- return file_put_contents($this->datadir . $path, $data);
+ if($return=rename($this->datadir.$path1, $this->datadir.$path2)) {
}
-
- public function unlink($path) {
- return $this->delTree($path);
- }
-
- public function rename($path1, $path2) {
- if (!$this->isUpdatable($path1)) {
- \OC_Log::write('core', 'unable to rename, file is not writable : ' . $path1, \OC_Log::ERROR);
- return false;
- }
- if (!$this->file_exists($path1)) {
- \OC_Log::write('core', 'unable to rename, file does not exists : ' . $path1, \OC_Log::ERROR);
- return false;
+ return $return;
+ }
+ public function copy($path1, $path2) {
+ if($this->is_dir($path2)) {
+ if(!$this->file_exists($path2)) {
+ $this->mkdir($path2);
}
-
- if ($return = rename($this->datadir . $path1, $this->datadir . $path2)) {
+ $source=substr($path1, strrpos($path1, '/')+1);
+ $path2.=$source;
+ }
+ return copy($this->datadir.$path1, $this->datadir.$path2);
+ }
+ public function fopen($path, $mode) {
+ if($return=fopen($this->datadir.$path, $mode)) {
+ switch($mode) {
+ case 'r':
+ break;
+ case 'r+':
+ case 'w+':
+ case 'x+':
+ case 'a+':
+ break;
+ case 'w':
+ case 'x':
+ case 'a':
+ break;
}
- return $return;
}
+ return $return;
+ }
- public function copy($path1, $path2) {
- if ($this->is_dir($path2)) {
- if (!$this->file_exists($path2)) {
- $this->mkdir($path2);
- }
- $source = substr($path1, strrpos($path1, '/') + 1);
- $path2 .= $source;
- }
- return copy($this->datadir . $path1, $this->datadir . $path2);
+ public function getMimeType($path) {
+ if($this->isReadable($path)) {
+ return \OC_Helper::getMimeType($this->datadir . $path);
+ }else{
+ return false;
}
+ }
- public function fopen($path, $mode) {
- if ($return = fopen($this->datadir . $path, $mode)) {
- switch ($mode) {
- case 'r':
- break;
- case 'r+':
- case 'w+':
- case 'x+':
- case 'a+':
- break;
- case 'w':
- case 'x':
- case 'a':
- break;
+ private function delTree($dir) {
+ $dirRelative=$dir;
+ $dir=$this->datadir.$dir;
+ if (!file_exists($dir)) return true;
+ if (!is_dir($dir) || is_link($dir)) return unlink($dir);
+ foreach (scandir($dir) as $item) {
+ if ($item == '.' || $item == '..') continue;
+ if(is_file($dir.'/'.$item)) {
+ if(unlink($dir.'/'.$item)) {
}
+ }elseif(is_dir($dir.'/'.$item)) {
+ if (!$this->delTree($dirRelative. "/" . $item)) {
+ return false;
+ };
}
- return $return;
}
-
- public function getMimeType($path) {
- if ($this->isReadable($path)) {
- return \OC_Helper::getMimeType($this->datadir . $path);
- } else {
- return false;
- }
+ if($return=rmdir($dir)) {
}
+ return $return;
+ }
- private function delTree($dir) {
- $dirRelative = $dir;
- $dir = $this->datadir . $dir;
- if (!file_exists($dir)) return true;
- if (!is_dir($dir) || is_link($dir)) return unlink($dir);
- foreach (scandir($dir) as $item) {
- if ($item == '.' || $item == '..') continue;
- if (is_file($dir . '/' . $item)) {
- if (unlink($dir . '/' . $item)) {
- }
- } elseif (is_dir($dir . '/' . $item)) {
- if (!$this->delTree($dirRelative . "/" . $item)) {
- return false;
- };
- }
+ private static function getFileSizeFromOS($fullPath) {
+ $name = strtolower(php_uname('s'));
+ // Windows OS: we use COM to access the filesystem
+ if (strpos($name, 'win') !== false) {
+ if (class_exists('COM')) {
+ $fsobj = new \COM("Scripting.FileSystemObject");
+ $f = $fsobj->GetFile($fullPath);
+ return $f->Size;
}
- if ($return = rmdir($dir)) {
+ } else if (strpos($name, 'bsd') !== false) {
+ if (\OC_Helper::is_function_enabled('exec')) {
+ return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
}
- return $return;
- }
-
- private static function getFileSizeFromOS($fullPath) {
- $name = strtolower(php_uname('s'));
- // Windows OS: we use COM to access the filesystem
- if (strpos($name, 'win') !== false) {
- if (class_exists('COM')) {
- $fsobj = new \COM("Scripting.FileSystemObject");
- $f = $fsobj->GetFile($fullPath);
- return $f->Size;
- }
- } else if (strpos($name, 'bsd') !== false) {
- if (\OC_Helper::is_function_enabled('exec')) {
- return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
- }
- } else if (strpos($name, 'linux') !== false) {
- if (\OC_Helper::is_function_enabled('exec')) {
- return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
- }
- } else {
- \OC_Log::write('core',
- 'Unable to determine file size of "' . $fullPath . '". Unknown OS: ' . $name,
- \OC_Log::ERROR);
+ } else if (strpos($name, 'linux') !== false) {
+ if (\OC_Helper::is_function_enabled('exec')) {
+ return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
}
-
- return 0;
- }
-
- public function hash($path, $type, $raw = false) {
- return hash_file($type, $this->datadir . $path, $raw);
+ } else {
+ \OC_Log::write('core',
+ 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name,
+ \OC_Log::ERROR);
}
- public function free_space($path) {
- $space = @disk_free_space($this->datadir . $path);
- if ($space === false) {
- return \OC\Files\FREE_SPACE_UNKNOWN;
- }
- return $space;
- }
+ return 0;
+ }
- public function search($query) {
- return $this->searchInDir($query);
- }
+ public function hash($path, $type, $raw=false) {
+ return hash_file($type, $this->datadir.$path, $raw);
+ }
- public function getLocalFile($path) {
- return $this->datadir . $path;
+ public function free_space($path) {
+ $space = @disk_free_space($this->datadir.$path);
+ if($space === false){
+ return \OC\Files\FREE_SPACE_UNKNOWN;
}
+ return $space;
+ }
- public function getLocalFolder($path) {
- return $this->datadir . $path;
- }
+ public function search($query) {
+ return $this->searchInDir($query);
+ }
+ public function getLocalFile($path) {
+ return $this->datadir.$path;
+ }
+ public function getLocalFolder($path) {
+ return $this->datadir.$path;
+ }
- protected function searchInDir($query, $dir = '') {
- $files = array();
- foreach (scandir($this->datadir . $dir) as $item) {
- if ($item == '.' || $item == '..') continue;
- if (strstr(strtolower($item), strtolower($query)) !== false) {
- $files[] = $dir . '/' . $item;
- }
- if (is_dir($this->datadir . $dir . '/' . $item)) {
- $files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
- }
+ protected function searchInDir($query, $dir='') {
+ $files=array();
+ foreach (scandir($this->datadir.$dir) as $item) {
+ if ($item == '.' || $item == '..') continue;
+ if(strstr(strtolower($item), strtolower($query))!==false) {
+ $files[]=$dir.'/'.$item;
+ }
+ if(is_dir($this->datadir.$dir.'/'.$item)) {
+ $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
}
- return $files;
}
+ return $files;
+ }
- /**
- * check if a file or folder has been updated since $time
- *
- * @param string $path
- * @param int $time
- * @return bool
- */
- public function hasUpdated($path, $time) {
- return $this->filemtime($path) > $time;
- }
+ /**
+ * check if a file or folder has been updated since $time
+ * @param string $path
+ * @param int $time
+ * @return bool
+ */
+ public function hasUpdated($path, $time) {
+ return $this->filemtime($path)>$time;
}
}
+}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index c96caebf4a..1da82da216 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -328,11 +328,6 @@ interface Storage {
*/
public function getWatcher($path = '');
- /**
- * @return \OC\Files\Cache\Storage
- */
- public function getStorageCache();
-
/**
* get the ETag for a file or folder
*
diff --git a/lib/files/view.php b/lib/files/view.php
index b1f24c514a..bd4812f8f8 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -972,7 +972,7 @@ class View {
*/
public function getPath($id) {
list($storage, $internalPath) = Cache\Cache::getById($id);
- $mounts = Filesystem::getMountByStorageId($storage);
+ $mounts = Mount::findByStorageId($storage);
foreach ($mounts as $mount) {
/**
* @var \OC\Files\Mount $mount
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 98b9608ce0..ae8233f80d 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Help" => "المساعدة",
"Personal" => "شخصي",
-"Settings" => "إعدادات",
+"Settings" => "تعديلات",
"Users" => "المستخدمين",
"Apps" => "التطبيقات",
"Admin" => "المدير",
@@ -48,5 +48,8 @@
"%d months ago" => "%d شهر مضت",
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s Ù…ØªØ§Ø . اØصل على <a href=\"%s\">المزيد من المعلومات </a>",
+"up to date" => "Ù…Øدّث",
+"updates check is disabled" => "ÙØص التØديثات معطّل",
"Could not find category \"%s\"" => "تعذر العثور على المجلد \"%s\""
);
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 73a7fdce48..2d4775a89f 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -44,5 +44,8 @@
"%d months ago" => "преди %d меÑеца",
"last year" => "поÑледната година",
"years ago" => "поÑледните години",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s е налична. Получете <a href=\"%s\">повече информациÑ</a>",
+"up to date" => "е актуална",
+"updates check is disabled" => "проверката за Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ðµ изключена",
"Could not find category \"%s\"" => "Ðевъзможно откриване на категориÑта \"%s\""
);
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
index f7c8f57466..cb6ff4455a 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/l10n/bn_BD.php
@@ -2,9 +2,9 @@
"Help" => "সহায়িকা",
"Personal" => "বà§à¦¯à¦•à§à¦¤à¦¿à¦—ত",
"Settings" => "নিয়ামকসমূহ",
-"Users" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
+"Users" => "বà§à¦¯à¦à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
"Apps" => "অà§à¦¯à¦¾à¦ª",
-"Admin" => "পà§à¦°à¦¶à¦¾à¦¸à¦¨",
+"Admin" => "পà§à¦°à¦¶à¦¾à¦¸à¦•",
"ZIP download is turned off." => "ZIP ডাউনলোড বনà§à¦§ করা আছে।",
"Files need to be downloaded one by one." => "ফাইলগà§à¦²à§‹ à¦à¦•à§‡ à¦à¦•à§‡ ডাউনলোড করা আবশà§à¦¯à¦•à¥¤",
"Back to Files" => "ফাইলে ফিরে চল",
@@ -13,7 +13,6 @@
"Authentication error" => "অনà§à¦®à§‹à¦¦à¦¨ ঘটিত সমসà§à¦¯à¦¾",
"Token expired. Please reload page." => "টোকেন মেয়াদোতà§à¦¤à§€à¦°à§à¦£à¥¤ দয়া করে পৃষà§à¦ াটি পূনরায় লোড করà§à¦¨à¥¤",
"Files" => "ফাইল",
-"Text" => "টেকà§à¦¸à¦Ÿ",
"seconds ago" => "সেকেনà§à¦¡ পূরà§à¦¬à§‡",
"1 minute ago" => "১ মিনিট পূরà§à¦¬à§‡",
"%d minutes ago" => "%d মিনিট পূরà§à¦¬à§‡",
@@ -23,5 +22,8 @@
"%d days ago" => "%d দিন পূরà§à¦¬à§‡",
"last month" => "গত মাস",
"last year" => "গত বছর",
-"years ago" => "বছর পূরà§à¦¬à§‡"
+"years ago" => "বছর পূরà§à¦¬à§‡",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s à¦à¦–ন সà§à¦²à¦à¥¤ <a href=\"%s\">আরও জানà§à¦¨</a>",
+"up to date" => "সরà§à¦¬à¦¶à§‡à¦·",
+"updates check is disabled" => "পরিবরà§à¦§à¦¨ পরীকà§à¦·à¦£ করা বনà§à¦§ রাখা হয়েছে"
);
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 028bf2343a..16dc74f40c 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -47,6 +47,9 @@
"last month" => "el mes passat",
"%d months ago" => "fa %d mesos",
"last year" => "l'any passat",
-"years ago" => "anys enrere",
+"years ago" => "fa anys",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s està disponible. Obtén <a href=\"%s\">més informació</a>",
+"up to date" => "actualitzat",
+"updates check is disabled" => "la comprovació d'actualitzacions està desactivada",
"Could not find category \"%s\"" => "No s'ha trobat la categoria \"%s\""
);
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index e3007f687d..79161c74e8 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -36,8 +36,8 @@
"MS SQL username and/or password not valid: %s" => "Uživatelské jméno, Äi heslo MSSQL nenà platné: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nenà správně nastaven pro umožněnà synchronizace, protože rozhranà WebDAV je rozbité.",
"Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosÃm, <a href='%s'>průvodce instalacÃ</a>.",
-"seconds ago" => "před pár vteřinami",
-"1 minute ago" => "před minutou",
+"seconds ago" => "před vteřinami",
+"1 minute ago" => "před 1 minutou",
"%d minutes ago" => "před %d minutami",
"1 hour ago" => "před hodinou",
"%d hours ago" => "před %d hodinami",
@@ -46,7 +46,10 @@
"%d days ago" => "před %d dny",
"last month" => "minulý mÄ›sÃc",
"%d months ago" => "PÅ™ed %d mÄ›sÃci",
-"last year" => "minulý rok",
+"last year" => "loni",
"years ago" => "před lety",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s je dostupná. ZÃskat <a href=\"%s\">vÃce informacÃ</a>",
+"up to date" => "aktuálnÃ",
+"updates check is disabled" => "kontrola aktualizacà je vypnuta",
"Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\""
);
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index ab5623bbf4..6cf88c15cc 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d mis yn ôl",
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ar gael. <a href=\"%s\">Mwy o wybodaeth</a>",
+"up to date" => "cyfredol",
+"updates check is disabled" => "gwirio am ddiweddariadau wedi'i analluogi",
"Could not find category \"%s\"" => "Methu canfod categori \"%s\""
);
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index dad64700e5..4850d0be19 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Help" => "Hjælp",
-"Personal" => "Personligt",
+"Personal" => "Personlig",
"Settings" => "Indstillinger",
"Users" => "Brugere",
"Apps" => "Apps",
@@ -41,12 +41,15 @@
"%d minutes ago" => "%d minutter siden",
"1 hour ago" => "1 time siden",
"%d hours ago" => "%d timer siden",
-"today" => "i dag",
-"yesterday" => "i går",
+"today" => "I dag",
+"yesterday" => "I går",
"%d days ago" => "%d dage siden",
-"last month" => "sidste måned",
+"last month" => "Sidste måned",
"%d months ago" => "%d måneder siden",
-"last year" => "sidste år",
+"last year" => "Sidste år",
"years ago" => "Ã¥r siden",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgængelig. Få <a href=\"%s\">mere information</a>",
+"up to date" => "opdateret",
+"updates check is disabled" => "Check for opdateringer er deaktiveret",
"Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\""
);
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index cd1bf104d3..7a680574bf 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -4,14 +4,14 @@
"Settings" => "Einstellungen",
"Users" => "Benutzer",
"Apps" => "Apps",
-"Admin" => "Administration",
+"Admin" => "Administrator",
"ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
"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",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
-"Authentication error" => "Fehler bei der Anmeldung",
+"Authentication error" => "Authentifizierungs-Fehler",
"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
"Files" => "Dateien",
"Text" => "Text",
@@ -35,9 +35,9 @@
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %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 <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
"seconds ago" => "Gerade eben",
-"1 minute ago" => "vor einer Minute",
+"1 minute ago" => "Vor einer Minute",
"%d minutes ago" => "Vor %d Minuten",
"1 hour ago" => "Vor einer Stunde",
"%d hours ago" => "Vor %d Stunden",
@@ -48,5 +48,8 @@
"%d months ago" => "Vor %d Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>",
+"up to date" => "aktuell",
+"updates check is disabled" => "Die Update-Überprüfung ist ausgeschaltet",
"Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
);
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 566e98b85c..eb002c97be 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -34,10 +34,10 @@
"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",
"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %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 eine Datei-Synchronisation konfiguriert, 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 für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
"seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor 1 Minute",
+"1 minute ago" => "Vor einer Minute",
"%d minutes ago" => "Vor %d Minuten",
"1 hour ago" => "Vor einer Stunde",
"%d hours ago" => "Vor %d Stunden",
@@ -48,5 +48,8 @@
"%d months ago" => "Vor %d Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>",
+"up to date" => "aktuell",
+"updates check is disabled" => "Die Update-Überprüfung ist ausgeschaltet",
"Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
);
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 14b63a8184..63f5d8eb83 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -42,11 +42,14 @@
"1 hour ago" => "1 ÏŽÏα Ï€Ïιν",
"%d hours ago" => "%d ÏŽÏες Ï€Ïιν",
"today" => "σήμεÏα",
-"yesterday" => "χτες",
+"yesterday" => "χθÎÏ‚",
"%d days ago" => "%d ημÎÏες Ï€Ïιν",
-"last month" => "τελευταίο μήνα",
+"last month" => "τον Ï€ÏοηγοÏμενο μήνα",
"%d months ago" => "%d μήνες Ï€Ïιν",
-"last year" => "τελευταίο χÏόνο",
+"last year" => "τον Ï€ÏοηγοÏμενο χÏόνο",
"years ago" => "χÏόνια Ï€Ïιν",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s είναι διαθÎσιμο. Δείτε <a href=\"%s\">πεÏισσότεÏες πληÏοφοÏίες</a>",
+"up to date" => "ενημεÏωμÎνο",
+"updates check is disabled" => "ο Îλεγχος ενημεÏώσεων είναι απενεÏγοποιημÎνος",
"Could not find category \"%s\"" => "Αδυναμία εÏÏεσης κατηγοÏίας \"%s\""
);
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 2782be65da..dac11ffe7e 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -15,7 +15,7 @@
"Files" => "Dosieroj",
"Text" => "Teksto",
"Images" => "Bildoj",
-"seconds ago" => "sekundoj antaÅe",
+"seconds ago" => "sekundojn antaÅe",
"1 minute ago" => "antaÅ 1 minuto",
"%d minutes ago" => "antaÅ %d minutoj",
"1 hour ago" => "antaÅ 1 horo",
@@ -23,9 +23,12 @@
"today" => "hodiaÅ",
"yesterday" => "hieraÅ",
"%d days ago" => "antaÅ %d tagoj",
-"last month" => "lastamonate",
+"last month" => "lasta monato",
"%d months ago" => "antaÅ %d monatoj",
-"last year" => "lastajare",
-"years ago" => "jaroj antaÅe",
+"last year" => "lasta jaro",
+"years ago" => "jarojn antaÅe",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>",
+"up to date" => "Äisdata",
+"updates check is disabled" => "Äisdateckontrolo estas malkapabligita",
"Could not find category \"%s\"" => "Ne troviÄis kategorio “%sâ€"
);
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index af96e693d1..5b868e2d45 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -44,9 +44,12 @@
"today" => "hoy",
"yesterday" => "ayer",
"%d days ago" => "hace %d dÃas",
-"last month" => "mes pasado",
+"last month" => "este mes",
"%d months ago" => "Hace %d meses",
-"last year" => "año pasado",
+"last year" => "este año",
"years ago" => "hace años",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Obtén <a href=\"%s\">más información</a>",
+"up to date" => "actualizado",
+"updates check is disabled" => "comprobar actualizaciones está desactivado",
"Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\""
);
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index e9da37e0a3..fc25cd6b1d 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Help" => "Ayuda",
"Personal" => "Personal",
-"Settings" => "Configuración",
+"Settings" => "Ajustes",
"Users" => "Usuarios",
"Apps" => "Aplicaciones",
"Admin" => "Administración",
@@ -11,7 +11,7 @@
"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
"couldn't be determined" => "no pudo ser determinado",
"Application is not enabled" => "La aplicación no está habilitada",
-"Authentication error" => "Error al autenticar",
+"Authentication error" => "Error de autenticación",
"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
"Files" => "Archivos",
"Text" => "Texto",
@@ -36,7 +36,7 @@
"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %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 <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guÃa de instalación</a>.",
-"seconds ago" => "segundos atrás",
+"seconds ago" => "hace unos segundos",
"1 minute ago" => "hace 1 minuto",
"%d minutes ago" => "hace %d minutos",
"1 hour ago" => "1 hora atrás",
@@ -44,9 +44,12 @@
"today" => "hoy",
"yesterday" => "ayer",
"%d days ago" => "hace %d dÃas",
-"last month" => "el mes pasado",
+"last month" => "este mes",
"%d months ago" => "%d meses atrás",
-"last year" => "el año pasado",
-"years ago" => "años atrás",
+"last year" => "este año",
+"years ago" => "hace años",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Conseguà <a href=\"%s\">más información</a>",
+"up to date" => "actualizado",
+"updates check is disabled" => "comprobar actualizaciones está desactivado",
"Could not find category \"%s\"" => "No fue posible encontrar la categorÃa \"%s\""
);
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 90c9c41682..25909e1555 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -18,7 +18,7 @@
"Images" => "Pildid",
"Set an admin username." => "Määra admin kasutajanimi.",
"Set an admin password." => "Määra admini parool.",
-"%s enter the database username." => "%s sisesta andmebaasi kasutajatunnus.",
+"%s enter the database username." => "%s sisesta andmebaasi kasutajatunnus",
"%s enter the database name." => "%s sisesta andmebaasi nimi.",
"%s you may not use dots in the database name" => "%s punktide kasutamine andmebaasi nimes pole lubatud",
"%s set the database host." => "%s määra andmebaasi server.",
@@ -44,9 +44,12 @@
"today" => "täna",
"yesterday" => "eile",
"%d days ago" => "%d päeva tagasi",
-"last month" => "viimasel kuul",
+"last month" => "eelmisel kuul",
"%d months ago" => "%d kuud tagasi",
-"last year" => "viimasel aastal",
+"last year" => "eelmisel aastal",
"years ago" => "aastat tagasi",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>",
+"up to date" => "ajakohane",
+"updates check is disabled" => "uuenduste kontrollimine on välja lülitatud",
"Could not find category \"%s\"" => "Ei leia kategooriat \"%s\""
);
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 934a4d19ab..fde65572d8 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -11,7 +11,7 @@
"Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
"couldn't be determined" => "ezin izan da zehaztu",
"Application is not enabled" => "Aplikazioa ez dago gaituta",
-"Authentication error" => "Autentifikazio errorea",
+"Authentication error" => "Autentikazio errorea",
"Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
"Files" => "Fitxategiak",
"Text" => "Testua",
@@ -36,7 +36,7 @@
"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
"Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
-"seconds ago" => "segundu",
+"seconds ago" => "orain dela segundu batzuk",
"1 minute ago" => "orain dela minutu 1",
"%d minutes ago" => "orain dela %d minutu",
"1 hour ago" => "orain dela ordu bat",
@@ -44,9 +44,12 @@
"today" => "gaur",
"yesterday" => "atzo",
"%d days ago" => "orain dela %d egun",
-"last month" => "joan den hilabetean",
+"last month" => "joan den hilabetea",
"%d months ago" => "orain dela %d hilabete",
-"last year" => "joan den urtean",
-"years ago" => "urte",
+"last year" => "joan den urtea",
+"years ago" => "orain dela urte batzuk",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s eskuragarri dago. Lortu <a href=\"%s\">informazio gehiago</a>",
+"up to date" => "eguneratuta",
+"updates check is disabled" => "eguneraketen egiaztapena ez dago gaituta",
"Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu"
);
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index c2e83f6616..201cae1953 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -11,7 +11,7 @@
"Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
"couldn't be determined" => "ei voitu määrittää",
"Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
-"Authentication error" => "Tunnistautumisvirhe",
+"Authentication error" => "Todennusvirhe",
"Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
"Files" => "Tiedostot",
"Text" => "Teksti",
@@ -43,5 +43,8 @@
"%d months ago" => "%d kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saatavilla. Lue <a href=\"%s\">lisätietoja</a>",
+"up to date" => "ajan tasalla",
+"updates check is disabled" => "päivitysten tarkistus on pois käytöstä",
"Could not find category \"%s\"" => "Luokkaa \"%s\" ei löytynyt"
);
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index c0920179db..ffc2945046 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -36,8 +36,8 @@
"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
"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 <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-"seconds ago" => "il y a quelques secondes",
-"1 minute ago" => "il y a une minute",
+"seconds ago" => "Ã l'instant",
+"1 minute ago" => "il y a 1 minute",
"%d minutes ago" => "il y a %d minutes",
"1 hour ago" => "Il y a une heure",
"%d hours ago" => "Il y a %d heures",
@@ -48,5 +48,8 @@
"%d months ago" => "Il y a %d mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>",
+"up to date" => "À jour",
+"updates check is disabled" => "la vérification des mises à jour est désactivée",
"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\""
);
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 783826508c..d38bf8329d 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Help" => "Axuda",
"Personal" => "Persoal",
-"Settings" => "Axustes",
+"Settings" => "Configuracións",
"Users" => "Usuarios",
"Apps" => "Aplicativos",
"Admin" => "Administración",
@@ -11,7 +11,7 @@
"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",
"Application is not enabled" => "O aplicativo non está activado",
-"Authentication error" => "Produciuse un erro de autenticación",
+"Authentication error" => "Produciuse un erro na autenticación",
"Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
"Files" => "Ficheiros",
"Text" => "Texto",
@@ -48,5 +48,8 @@
"%d months ago" => "Vai %d meses",
"last year" => "último ano",
"years ago" => "anos atrás",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está dispoñÃbel. Obtéña <a href=\"%s\">máis información</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/he.php b/lib/l10n/he.php
index dcd0545adb..078a731afc 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -27,5 +27,8 @@
"%d months ago" => "×œ×¤× ×™ %d חודשי×",
"last year" => "×©× ×” שעברה",
"years ago" => "×©× ×™×",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s זמין. קבלת <a href=\"%s\">מידע × ×•×¡×£</a>",
+"up to date" => "×¢×“×›× ×™",
+"updates check is disabled" => "בדיקת ×¢×“×›×•× ×™× ×ž× ×•×˜×¨×œ×ª",
"Could not find category \"%s\"" => "×œ× × ×™×ª×Ÿ ×œ×ž×¦×•× ×ת הקטגוריה „%s“"
);
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
index 3ce75c99f0..8b0dd6de0a 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -3,7 +3,6 @@
"Personal" => "Osobno",
"Settings" => "Postavke",
"Users" => "Korisnici",
-"Apps" => "Aplikacije",
"Admin" => "Administrator",
"Authentication error" => "Greška kod autorizacije",
"Files" => "Datoteke",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 841020183b..4621c5074b 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -11,7 +11,7 @@
"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörÃtéshez.",
"couldn't be determined" => "nem határozható meg",
"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
-"Authentication error" => "AzonosÃtási hiba",
+"Authentication error" => "HitelesÃtési hiba",
"Token expired. Please reload page." => "A token lejárt. FrissÃtse az oldalt.",
"Files" => "Fájlok",
"Text" => "Szöveg",
@@ -36,7 +36,7 @@
"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelÅ‘en beállÃtva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepÃtési útmutatót</a>.",
-"seconds ago" => "pár másodperce",
+"seconds ago" => "másodperce",
"1 minute ago" => "1 perce",
"%d minutes ago" => "%d perce",
"1 hour ago" => "1 órája",
@@ -47,6 +47,9 @@
"last month" => "múlt hónapban",
"%d months ago" => "%d hónapja",
"last year" => "tavaly",
-"years ago" => "több éve",
+"years ago" => "éve",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s elérhető. <a href=\"%s\">További információ</a>.",
+"up to date" => "a legfrissebb változat",
+"updates check is disabled" => "A frissitések ellenőrzése nincs engedélyezve.",
"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\""
);
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
index 573281553f..e790c41d07 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -3,7 +3,6 @@
"Personal" => "Personal",
"Settings" => "Configurationes",
"Users" => "Usatores",
-"Apps" => "Applicationes",
"Admin" => "Administration",
"Files" => "Files",
"Text" => "Texto"
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 54b46cd896..7eb26c5eb8 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d bulan yang lalu",
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s tersedia. Dapatkan <a href=\"%s\">info lebih lanjut</a>",
+"up to date" => "terbaru",
+"updates check is disabled" => "Pemeriksaan pembaruan dinonaktifkan.",
"Could not find category \"%s\"" => "Tidak dapat menemukan kategori \"%s\""
);
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
index 05bb688395..8fdb45a05c 100644
--- a/lib/l10n/is.php
+++ b/lib/l10n/is.php
@@ -27,5 +27,8 @@
"%d months ago" => "fyrir %d mánuðum",
"last year" => "sÃðasta ári",
"years ago" => "einhverjum árum",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s er à boði. Sækja <a href=\"%s\">meiri upplýsingar</a>",
+"up to date" => "nýjasta útgáfa",
+"updates check is disabled" => "uppfærslupróf er ekki virkjað",
"Could not find category \"%s\"" => "Fann ekki flokkinn \"%s\""
);
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 1db48dbc80..847f767fa7 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -37,16 +37,19 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
"seconds ago" => "secondi fa",
-"1 minute ago" => "Un minuto fa",
+"1 minute ago" => "1 minuto fa",
"%d minutes ago" => "%d minuti fa",
"1 hour ago" => "1 ora fa",
"%d hours ago" => "%d ore fa",
"today" => "oggi",
"yesterday" => "ieri",
"%d days ago" => "%d giorni fa",
-"last month" => "mese scorso",
+"last month" => "il mese scorso",
"%d months ago" => "%d mesi fa",
-"last year" => "anno scorso",
+"last year" => "l'anno scorso",
"years ago" => "anni fa",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s è disponibile. Ottieni <a href=\"%s\">ulteriori informazioni</a>",
+"up to date" => "aggiornato",
+"updates check is disabled" => "il controllo degli aggiornamenti è disabilitato",
"Could not find category \"%s\"" => "Impossibile trovare la categoria \"%s\""
);
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 3b97ffc431..18d0833792 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -1,10 +1,10 @@
<?php $TRANSLATIONS = array(
"Help" => "ヘルプ",
-"Personal" => "個人",
+"Personal" => "個人è¨å®š",
"Settings" => "è¨å®š",
"Users" => "ユーザ",
"Apps" => "アプリ",
-"Admin" => "管ç†",
+"Admin" => "管ç†è€…",
"ZIP download is turned off." => "ZIPダウンãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚",
"Files need to be downloaded one by one." => "ファイルã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
"Back to Files" => "ファイルã«æˆ»ã‚‹",
@@ -37,16 +37,19 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBサーãƒã¯ã¾ã ファイルã®åŒæœŸã‚’許å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよã確èªã—ã¦ãã ã•ã„。",
"seconds ago" => "数秒å‰",
-"1 minute ago" => "1 分å‰",
+"1 minute ago" => "1分å‰",
"%d minutes ago" => "%d 分å‰",
"1 hour ago" => "1 時間å‰",
"%d hours ago" => "%d 時間å‰",
"today" => "今日",
"yesterday" => "昨日",
"%d days ago" => "%d æ—¥å‰",
-"last month" => "一月å‰",
+"last month" => "先月",
"%d months ago" => "%d 分å‰",
-"last year" => "一年å‰",
+"last year" => "昨年",
"years ago" => "å¹´å‰",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚<a href=\"%s\">è©³ç´°æƒ…å ±</a> を確èªãã ã•ã„",
+"up to date" => "最新ã§ã™",
+"updates check is disabled" => "æ›´æ–°ãƒã‚§ãƒƒã‚¯ã¯ç„¡åŠ¹ã§ã™",
"Could not find category \"%s\"" => "カテゴリ \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
);
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index a55323832e..ffdf549f48 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d თვის წინ",
"last year" => "ბáƒáƒšáƒ წელს",
"years ago" => "წლის წინ",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ხელმისáƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ. მიიღეთ <a href=\"%s\">უფრრმეტი ინფáƒáƒ მáƒáƒªáƒ˜áƒ</a>",
+"up to date" => "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ",
+"updates check is disabled" => "გáƒáƒœáƒáƒ®áƒšáƒ”ბის ძებნრგáƒáƒ—იშულიáƒ",
"Could not find category \"%s\"" => "\"%s\" კáƒáƒ¢áƒ”გáƒáƒ იის მáƒáƒ«áƒ”ბნრვერმáƒáƒ®áƒ”რხდáƒ"
);
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index bf2a68369f..859657f46b 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -28,5 +28,8 @@
"%d months ago" => "%d개월 ì „",
"last year" => "ìž‘ë…„",
"years ago" => "ë…„ ì „",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%sì„(를) ì‚¬ìš©í• ìˆ˜ 있습니다. <a href=\"%s\">ìžì„¸í•œ ì •ë³´ 보기</a>",
+"up to date" => "ìµœì‹ ",
+"updates check is disabled" => "ì—…ë°ì´íŠ¸ 확ì¸ì´ 비활성화ë¨",
"Could not find category \"%s\"" => "분류 \"%s\"ì„(를) ì°¾ì„ ìˆ˜ 없습니다."
);
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index 20d0249f56..f3165b8586 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -2,6 +2,5 @@
"Help" => "یارمەتی",
"Settings" => "ده‌ستكاری",
"Users" => "به‌كارهێنه‌ر",
-"Apps" => "به‌رنامه‌كان",
"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی"
);
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 889fc3a377..16f1f674e9 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -2,8 +2,6 @@
"Help" => "Hëllef",
"Personal" => "Perséinlech",
"Settings" => "Astellungen",
-"Users" => "Benotzer",
-"Apps" => "Applicatiounen",
"Admin" => "Admin",
"Authentication error" => "Authentifikatioun's Fehler",
"Files" => "Dateien",
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index cebaa6937d..b84c155633 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -14,13 +14,16 @@
"Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
"Files" => "Failai",
"Text" => "ŽinuÄių",
-"seconds ago" => "prieš sekundę",
-"1 minute ago" => "Prieš 1 minutę",
+"seconds ago" => "prieš kelias sekundes",
+"1 minute ago" => "prieš 1 minutę",
"%d minutes ago" => "prieÅ¡ %d minuÄių",
"today" => "Å¡iandien",
"yesterday" => "vakar",
"%d days ago" => "prieš %d dienų",
-"last month" => "praeitą mėnesį",
-"last year" => "praeitais metais",
-"years ago" => "prieš metus"
+"last month" => "praėjusį mėnesį",
+"last year" => "pereitais metais",
+"years ago" => "prieš metus",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s yra galimas. PlatesnÄ— <a href=\"%s\">informacija Äia</a>",
+"up to date" => "pilnai atnaujinta",
+"updates check is disabled" => "atnaujinimų tikrinimas išjungtas"
);
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 28b96c56e1..3879391407 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -48,5 +48,8 @@
"%d months ago" => "pirms %d mēnešiem",
"last year" => "gÄjuÅ¡ajÄ gadÄ",
"years ago" => "gadus atpakaļ",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ir pieejams. IegÅ«t <a href=\"%s\">vairÄk informÄcijas</a>",
+"up to date" => "ir aktuÄls",
+"updates check is disabled" => "atjauninÄjumu pÄrbaude ir deaktivÄ“ta",
"Could not find category \"%s\"" => "NevarÄ“ja atrast kategoriju “%sâ€"
);
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 34790c9374..5b3efffb22 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Help" => "Помош",
"Personal" => "Лично",
-"Settings" => "ПодеÑувања",
+"Settings" => "Параметри",
"Users" => "КориÑници",
"Apps" => "Ðппликации",
"Admin" => "Ðдмин",
@@ -27,5 +27,8 @@
"%d months ago" => "пред %d меÑеци",
"last year" => "минатата година",
"years ago" => "пред години",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s е доÑтапно. Земи <a href=\"%s\">повеќе информации</a>",
+"up to date" => "ажурно",
+"updates check is disabled" => "проверката за ажурирања е оневозможена",
"Could not find category \"%s\"" => "Ðе можам да најдам категорија „%s“"
);
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index 6abbbe86e8..732ea96c6b 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -3,7 +3,6 @@
"Personal" => "Peribadi",
"Settings" => "Tetapan",
"Users" => "Pengguna",
-"Apps" => "Aplikasi",
"Admin" => "Admin",
"Authentication error" => "Ralat pengesahan",
"Files" => "Fail-fail",
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index 5d1812fd74..d725a06a3a 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -24,5 +24,8 @@
"%d months ago" => "%d လအရင်က",
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ကá€á€¯á€›á€›á€¾á€á€”á€á€¯á€„်ပါပြီዠ<a href=\"%s\">နောက်ထပ်အá€á€»á€€á€ºá€¡á€œá€€á€ºá€™á€»á€¬á€¸</a>ရယူပါá‹",
+"up to date" => "နောက်ဆုံးပေါ်",
+"updates check is disabled" => "နောက်ဆုံးပေါ်စစ်ဆေးá€á€¼á€„်းကá€á€¯á€•á€á€á€ºá€‘ားသည်",
"Could not find category \"%s\"" => "\"%s\"á€á€±á€«á€„်းစဉ်ကá€á€¯ ရှာမá€á€½á€±á€·á€•á€«"
);
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index fc95561d3b..01144672ca 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -10,7 +10,7 @@
"Back to Files" => "Tilbake til filer",
"Selected files too large to generate zip file." => "De valgte filene er for store til å kunne generere ZIP-fil",
"Application is not enabled" => "Applikasjon er ikke påslått",
-"Authentication error" => "Autentikasjonsfeil",
+"Authentication error" => "Autentiseringsfeil",
"Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
"Files" => "Filer",
"Text" => "Tekst",
@@ -25,7 +25,10 @@
"%d days ago" => "%d dager siden",
"last month" => "forrige måned",
"%d months ago" => "%d måneder siden",
-"last year" => "forrige år",
+"last year" => "i fjor",
"years ago" => "Ã¥r siden",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgjengelig. FÃ¥ <a href=\"%s\">mer informasjon</a>",
+"up to date" => "oppdatert",
+"updates check is disabled" => "versjonssjekk er avslått",
"Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\""
);
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 0c38714261..f7cc6ad899 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s is beschikbaar. Verkrijg <a href=\"%s\">meer informatie</a>",
+"up to date" => "bijgewerkt",
+"updates check is disabled" => "Meest recente versie controle is uitgeschakeld",
"Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden"
);
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index f8f15c9fba..4de21cd9c2 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -3,19 +3,8 @@
"Personal" => "Personleg",
"Settings" => "Innstillingar",
"Users" => "Brukarar",
-"Apps" => "Applikasjonar",
"Admin" => "Administrer",
"Authentication error" => "Feil i autentisering",
"Files" => "Filer",
-"Text" => "Tekst",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
-"seconds ago" => "sekund sidan",
-"1 minute ago" => "1 minutt sidan",
-"1 hour ago" => "1 time sidan",
-"today" => "i dag",
-"yesterday" => "i går",
-"last month" => "førre månad",
-"last year" => "i fjor",
-"years ago" => "Ã¥r sidan"
+"Text" => "Tekst"
);
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index 85e2a27b43..8916139338 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -18,5 +18,7 @@
"%d days ago" => "%d jorns a",
"last month" => "mes passat",
"last year" => "an passat",
-"years ago" => "ans a"
+"years ago" => "ans a",
+"up to date" => "a jorn",
+"updates check is disabled" => "la verificacion de mesa a jorn es inactiva"
);
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 4ac1c14439..c508794c42 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -34,19 +34,22 @@
"Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
"Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s",
"MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
-"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer www nie jest jeszcze poprawnie ustawiony, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony. Sprawdź ustawienia serwera.",
+"Please double check the <a href='%s'>installation guides</a>." => "Proszę sprawdź ponownie <a href='%s'>przewodnik instalacji</a>.",
"seconds ago" => "sekund temu",
"1 minute ago" => "1 minutÄ™ temu",
"%d minutes ago" => "%d minut temu",
-"1 hour ago" => "1 godzinÄ™ temu",
+"1 hour ago" => "1 godzine temu",
"%d hours ago" => "%d godzin temu",
-"today" => "dziÅ›",
+"today" => "dzisiaj",
"yesterday" => "wczoraj",
"%d days ago" => "%d dni temu",
-"last month" => "w zeszłym miesiącu",
+"last month" => "ostatni miesiÄ…c",
"%d months ago" => "%d miesiecy temu",
-"last year" => "w zeszłym roku",
+"last year" => "ostatni rok",
"years ago" => "lat temu",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s jest dostępna. Uzyskaj <a href=\"%s\">więcej informacji</a>",
+"up to date" => "Aktualne",
+"updates check is disabled" => "wybór aktualizacji jest wyłączony",
"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\""
);
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 4c50f8de9e..8196b43be2 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponÃvel. Obtenha <a href=\"%s\">mais informações</a>",
+"up to date" => "atualizado",
+"updates check is disabled" => "checagens de atualização estão desativadas",
"Could not find category \"%s\"" => "ImpossÃvel localizar categoria \"%s\""
);
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index b3befe96e0..12470686e7 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -36,17 +36,20 @@
"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %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 <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
-"seconds ago" => "Minutos atrás",
-"1 minute ago" => "Há 1 minuto",
+"seconds ago" => "há alguns segundos",
+"1 minute ago" => "há 1 minuto",
"%d minutes ago" => "há %d minutos",
"1 hour ago" => "Há 1 horas",
"%d hours ago" => "Há %d horas",
"today" => "hoje",
"yesterday" => "ontem",
"%d days ago" => "há %d dias",
-"last month" => "ultÃmo mês",
+"last month" => "mês passado",
"%d months ago" => "Há %d meses atrás",
"last year" => "ano passado",
-"years ago" => "anos atrás",
+"years ago" => "há anos",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponÃvel. Obtenha <a href=\"%s\">mais informação</a>",
+"up to date" => "actualizado",
+"updates check is disabled" => "a verificação de actualizações está desligada",
"Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\""
);
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 6661caf86e..3f8e59cdac 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -28,5 +28,8 @@
"%d months ago" => "%d luni in urma",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>",
+"up to date" => "la zi",
+"updates check is disabled" => "verificarea după actualizări este dezactivată",
"Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\""
);
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index e716f6d1c1..6f351cd458 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Help" => "Помощь",
"Personal" => "Личное",
-"Settings" => "КонфигурациÑ",
+"Settings" => "ÐаÑтройки",
"Users" => "Пользователи",
"Apps" => "ПриложениÑ",
"Admin" => "Admin",
@@ -36,7 +36,7 @@
"MS SQL username and/or password not valid: %s" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MS SQL не подходит: %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 <a href='%s'>installation guides</a>." => "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>.",
-"seconds ago" => "неÑколько Ñекунд назад",
+"seconds ago" => "менее минуты",
"1 minute ago" => "1 минуту назад",
"%d minutes ago" => "%d минут назад",
"1 hour ago" => "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´",
@@ -47,6 +47,9 @@
"last month" => "в прошлом меÑÑце",
"%d months ago" => "%d меÑÑцев назад",
"last year" => "в прошлом году",
-"years ago" => "неÑколько лет назад",
+"years ago" => "годы назад",
+"%s is available. Get <a href=\"%s\">more information</a>" => "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>",
+"up to date" => "Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ€ÑиÑ",
+"updates check is disabled" => "проверка обновлений отключена",
"Could not find category \"%s\"" => "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\" не найдена"
);
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index 8fb568aee7..de77056366 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -1,3 +1,37 @@
<?php $TRANSLATIONS = array(
-"Settings" => "ÐаÑтройки"
+"Help" => "Помощь",
+"Personal" => "ПерÑональный",
+"Settings" => "ÐаÑтройки",
+"Users" => "Пользователи",
+"Apps" => "ПриложениÑ",
+"Admin" => "Ðдмин",
+"ZIP download is turned off." => "Загрузка ZIP выключена.",
+"Files need to be downloaded one by one." => "Файлы должны быть загружены один за другим.",
+"Back to Files" => "Обратно к файлам",
+"Selected files too large to generate zip file." => "Выбранные файлы Ñлишком велики Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ zip-архива.",
+"couldn't be determined" => "не может быть определено",
+"Application is not enabled" => "Приложение не запущено",
+"Authentication error" => "Ошибка аутентификации",
+"Token expired. Please reload page." => "Маркер иÑтек. ПожалуйÑта, перезагрузите Ñтраницу.",
+"Files" => "Файлы",
+"Text" => "ТекÑÑ‚",
+"Images" => "ИзображениÑ",
+"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 <a href='%s'>installation guides</a>." => "ПожалуйÑта проверте дважды <a href='%s'>гиды по уÑтановке</a>.",
+"seconds ago" => "Ñекунд назад",
+"1 minute ago" => "1 минуту назад",
+"%d minutes ago" => "%d минут назад",
+"1 hour ago" => "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´",
+"%d hours ago" => "%d чаÑов назад",
+"today" => "ÑегоднÑ",
+"yesterday" => "вчера",
+"%d days ago" => "%d дней назад",
+"last month" => "в прошлом меÑÑце",
+"%d months ago" => "%d меÑÑцев назад",
+"last year" => "в прошлом году",
+"years ago" => "год назад",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s доÑтупно. Получите <a href=\"%s\">more information</a>",
+"up to date" => "до наÑтоÑщего времени",
+"updates check is disabled" => "Проверка обновлений отключена",
+"Could not find category \"%s\"" => "Ðе удалоÑÑŒ найти категорию \"%s\""
);
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index 4846fdcc06..25624acf70 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -10,7 +10,7 @@
"Back to Files" => "ගොනු වෙà¶à¶§ නà·à·€à¶ යන්න",
"Selected files too large to generate zip file." => "à¶à·à¶»à·à¶œà¶à·Š ගොනු ZIP ගොනුවක් à¶à·à¶±à·“මට විà·à·à¶½ à·€à·à¶©à·’ය.",
"Application is not enabled" => "යෙදුම සක්â€à¶»à·’ය කර නොමà·à¶",
-"Authentication error" => "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶± දà·à·‚යක්",
+"Authentication error" => "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶±à¶º කිරීමේ දà·à·à¶ºà¶šà·Š",
"Token expired. Please reload page." => "ටà·à¶šà¶±à¶º කල් ඉකුà¶à·Š වී ඇà¶. පිටුව නà·à·€à·”ම් කරන්න",
"Files" => "ගොනු",
"Text" => "පෙළ",
@@ -23,5 +23,8 @@
"%d days ago" => "%d දිනකට පෙර",
"last month" => "පෙර මà·à·ƒà¶ºà·š",
"last year" => "පෙර අවුරුද්දේ",
-"years ago" => "අවුරුදු කීපයකට පෙර"
+"years ago" => "අවුරුදු කීපයකට පෙර",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s යොදà·à¶œà¶ à·„à·à¶š. <a href=\"%s\">à¶à·€ විස්à¶à¶»</a> ලබà·à¶œà¶±à·Šà¶±",
+"up to date" => "යà·à·€à¶à·Šà¶šà·à¶½à·“නයි",
+"updates check is disabled" => "යà·à·€à¶à·Šà¶šà·à¶½à·“න බව පරීක්ෂණය අක්â€à¶»à·’යයි"
);
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index e074ed78c3..2ab255ef8f 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -37,7 +37,7 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
"Please double check the <a href='%s'>installation guides</a>." => "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnú prÃruÄku</a>.",
"seconds ago" => "pred sekundami",
-"1 minute ago" => "pred minútou",
+"1 minute ago" => "pred 1 minútou",
"%d minutes ago" => "pred %d minútami",
"1 hour ago" => "Pred 1 hodinou",
"%d hours ago" => "Pred %d hodinami.",
@@ -48,5 +48,8 @@
"%d months ago" => "Pred %d mesiacmi.",
"last year" => "minulý rok",
"years ago" => "pred rokmi",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s je dostupné. ZÃskaÅ¥ <a href=\"%s\">pre viac informáciÃ</a>",
+"up to date" => "aktuálny",
+"updates check is disabled" => "sledovanie aktualizácià je vypnuté",
"Could not find category \"%s\"" => "Nemožno nájsť danú kategóriu \"%s\""
);
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 0c42f44d2a..8775cdd030 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -11,7 +11,7 @@
"Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.",
"couldn't be determined" => "ni mogoÄe doloÄiti",
"Application is not enabled" => "Program ni omogoÄen",
-"Authentication error" => "Napaka pri overjanju",
+"Authentication error" => "Napaka overitve",
"Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.",
"Files" => "Datoteke",
"Text" => "Besedilo",
@@ -44,9 +44,12 @@
"today" => "danes",
"yesterday" => "vÄeraj",
"%d days ago" => "pred %d dnevi",
-"last month" => "zadnji mesec",
+"last month" => "prejšnji mesec",
"%d months ago" => "Pred %d meseci",
"last year" => "lansko leto",
-"years ago" => "let nazaj",
+"years ago" => "pred nekaj leti",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">VeÄ podrobnosti.</a>",
+"up to date" => "posodobljeno",
+"updates check is disabled" => "preverjanje za posodobitve je onemogoÄeno",
"Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoÄe najti."
);
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index 60d83ca48c..649af3c5c2 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -1,7 +1,7 @@
<?php $TRANSLATIONS = array(
"Help" => "Ndihmë",
"Personal" => "Personale",
-"Settings" => "Parametra",
+"Settings" => "Parametrat",
"Users" => "Përdoruesit",
"Apps" => "App",
"Admin" => "Admin",
@@ -48,5 +48,8 @@
"%d months ago" => "%d muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s është i disponueshëm. <a href=\"%s\">Informohuni këtu</a>",
+"up to date" => "i azhornuar",
+"updates check is disabled" => "kontrollimi i azhurnimeve është i çaktivizuar",
"Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet"
);
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 45b8e06200..5c6620f82b 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -21,7 +21,7 @@
"seconds ago" => "пре неколико Ñекунди",
"1 minute ago" => "пре 1 минут",
"%d minutes ago" => "пре %d минута",
-"1 hour ago" => "Пре једног Ñата",
+"1 hour ago" => "пре 1 Ñат",
"%d hours ago" => "пре %d Ñата/и",
"today" => "данаÑ",
"yesterday" => "јуче",
@@ -30,5 +30,8 @@
"%d months ago" => "пре %d меÑеца/и",
"last year" => "прошле године",
"years ago" => "година раније",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s је доÑтупна. Погледајте <a href=\"%s\">више информација</a>.",
+"up to date" => "је ажурна",
+"updates check is disabled" => "провера ажурирања је онемогућена",
"Could not find category \"%s\"" => "Ðе могу да пронађем категорију „%s“."
);
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
index 13cedc8327..2f0a97fd77 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -3,7 +3,6 @@
"Personal" => "LiÄno",
"Settings" => "Podešavanja",
"Users" => "Korisnici",
-"Apps" => "Programi",
"Admin" => "Adninistracija",
"Authentication error" => "Greška pri autentifikaciji",
"Files" => "Fajlovi",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 3dcb26d5d8..63ca60e89c 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -23,12 +23,15 @@
"%d minutes ago" => "%d minuter sedan",
"1 hour ago" => "1 timme sedan",
"%d hours ago" => "%d timmar sedan",
-"today" => "i dag",
-"yesterday" => "i går",
+"today" => "idag",
+"yesterday" => "igår",
"%d days ago" => "%d dagar sedan",
"last month" => "förra månaden",
"%d months ago" => "%d månader sedan",
"last year" => "förra året",
"years ago" => "Ã¥r sedan",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s finns. FÃ¥ <a href=\"%s\">mer information</a>",
+"up to date" => "uppdaterad",
+"updates check is disabled" => "uppdateringskontroll är inaktiverad",
"Could not find category \"%s\"" => "Kunde inte hitta kategorin \"%s\""
);
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
index c9bb578b40..c76394bcb4 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/l10n/ta_LK.php
@@ -2,7 +2,7 @@
"Help" => "உதவி",
"Personal" => "தனிபà¯à®ªà®Ÿà¯à®Ÿ",
"Settings" => "அமைபà¯à®ªà¯à®•à®³à¯",
-"Users" => "பயனாளரà¯",
+"Users" => "பயனாளரà¯à®•à®³à¯",
"Apps" => "செயலிகளà¯",
"Admin" => "நிரà¯à®µà®¾à®•à®®à¯",
"ZIP download is turned off." => "வீசொலிப௠பூடà¯à®Ÿà¯ பதிவிறகà¯à®•à®®à¯ நிறà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯.",
@@ -27,5 +27,8 @@
"%d months ago" => "%d மாததà¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
"last year" => "கடநà¯à®¤ வரà¯à®Ÿà®®à¯",
"years ago" => "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s இனà¯à®©à¯à®®à¯ இரà¯à®•à¯à®•à®¿à®©à¯à®±à®©. <a href=\"%s\">மேலதிக தகவலà¯à®•à®³à¯à®•à¯à®•à¯</a> எடà¯à®•à¯à®•",
+"up to date" => "நவீன",
+"updates check is disabled" => "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯ˆ சரிபாரà¯à®ªà¯à®ªà®¤à¯ˆ செயலறà¯à®±à®¤à®¾à®•à¯à®•à¯à®•",
"Could not find category \"%s\"" => "பிரிவ௠\"%s\" ஠கணà¯à®Ÿà¯à®ªà¯à®ªà®¿à®Ÿà®¿à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
);
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 7cda4ab6ae..0da607a058 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -16,8 +16,8 @@
"Files" => "ไฟล์",
"Text" => "ข้à¸à¸„วาม",
"Images" => "รูปภาพ",
-"seconds ago" => "วินาที à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"1 minute ago" => "1 นาทีà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
+"seconds ago" => "วินาทีที่ผ่านมา",
+"1 minute ago" => "1 นาทีมาà¹à¸¥à¹‰à¸§",
"%d minutes ago" => "%d นาทีที่ผ่านมา",
"1 hour ago" => "1 ชั่วโมงà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
"%d hours ago" => "%d ชั่วโมงà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
@@ -27,6 +27,9 @@
"last month" => "เดืà¸à¸™à¸—ี่à¹à¸¥à¹‰à¸§",
"%d months ago" => "%d เดืà¸à¸™à¸¡à¸²à¹à¸¥à¹‰à¸§",
"last year" => "ปีที่à¹à¸¥à¹‰à¸§",
-"years ago" => "ปี ที่ผ่านมา",
+"years ago" => "ปีที่ผ่านมา",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s พร้à¸à¸¡à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้à¹à¸¥à¹‰à¸§. <a href=\"%s\">ดูรายละเà¸à¸µà¸¢à¸”เพิ่มเติม</a>",
+"up to date" => "ทันสมัย",
+"updates check is disabled" => "à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸Šà¸¸à¸”à¸à¸±à¸žà¹€à¸”ทถูà¸à¸›à¸´à¸”ใช้งานไว้",
"Could not find category \"%s\"" => "ไม่พบหมวดหมู่ \"%s\""
);
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 94ffed067c..4a8292989a 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -1,5 +1,5 @@
<?php $TRANSLATIONS = array(
-"Help" => "Yardım",
+"Help" => "Yardı",
"Personal" => "KiÅŸisel",
"Settings" => "Ayarlar",
"Users" => "Kullanıcılar",
@@ -40,5 +40,8 @@
"%d months ago" => "%d ay önce",
"last year" => "geçen yıl",
"years ago" => "yıl önce",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s kullanılabilir durumda. <a href=\"%s\">Daha fazla bilgi</a> alın",
+"up to date" => "güncel",
+"updates check is disabled" => "güncelleme kontrolü kapalı",
"Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı"
);
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index a544890124..9dfc16c346 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d міÑÑців тому",
"last year" => "минулого року",
"years ago" => "роки тому",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s доÑтупно. Отримати <a href=\"%s\">детальну інформацію</a>",
+"up to date" => "оновлено",
+"updates check is disabled" => "перевірка оновлень відключена",
"Could not find category \"%s\"" => "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ категорію \"%s\""
);
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index 6a4b8ebac9..ea9660093a 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -13,10 +13,10 @@
"Application is not enabled" => "Ứng dụng không được BẬT",
"Authentication error" => "Lỗi xác thực",
"Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.",
-"Files" => "Táºp tin",
+"Files" => "Các táºp tin",
"Text" => "Văn bản",
"Images" => "Hình ảnh",
-"seconds ago" => "và i giây trước",
+"seconds ago" => "1 giây trước",
"1 minute ago" => "1 phút trước",
"%d minutes ago" => "%d phút trước",
"1 hour ago" => "1 giá» trÆ°á»›c",
@@ -28,5 +28,8 @@
"%d months ago" => "%d tháng trước",
"last year" => "năm trước",
"years ago" => "năm trước",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s có sẵn. <a href=\"%s\">xem thêm ở đây</a>",
+"up to date" => "đến ngà y",
+"updates check is disabled" => "đã TÄ‚T chức năng cáºp nháºt ",
"Could not find category \"%s\"" => "không thể tìm thấy mục \"%s\""
);
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 3ab35f2baf..1648733942 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -26,5 +26,8 @@
"%d days ago" => "%d 天å‰",
"last month" => "上个月",
"last year" => "去年",
-"years ago" => "å¹´å‰"
+"years ago" => "å¹´å‰",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ä¸å¯ç”¨ã€‚获知 <a href=\"%s\">详情</a>",
+"up to date" => "最新",
+"updates check is disabled" => "更新检测已ç¦ç”¨"
);
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index cab5142e5d..2dea94dec3 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -36,8 +36,8 @@
"MS SQL username and/or password not valid: %s" => "MS SQL 用户åå’Œ/或密ç æ— æ•ˆï¼š%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 <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指å—</a>.",
-"seconds ago" => "秒å‰",
-"1 minute ago" => "一分钟å‰",
+"seconds ago" => "å‡ ç§’å‰",
+"1 minute ago" => "1分钟å‰",
"%d minutes ago" => "%d 分钟å‰",
"1 hour ago" => "1å°æ—¶å‰",
"%d hours ago" => "%då°æ—¶å‰",
@@ -47,6 +47,9 @@
"last month" => "上月",
"%d months ago" => "%d 月å‰",
"last year" => "去年",
-"years ago" => "å¹´å‰",
+"years ago" => "å‡ å¹´å‰",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s å·²å˜åœ¨ã€‚ç‚¹æ¤ <a href=\"%s\">获å–更多信æ¯</a>",
+"up to date" => "已更新。",
+"updates check is disabled" => "更新检查功能被ç¦ç”¨ã€‚",
"Could not find category \"%s\"" => "æ— æ³•æ‰¾åˆ°åˆ†ç±» \"%s\""
);
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 5affb1ccf3..fbcf81ad3a 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -48,5 +48,8 @@
"%d months ago" => "%d 個月之å‰",
"last year" => "去年",
"years ago" => "幾年å‰",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已經å¯ç”¨ã€‚å–å¾— <a href=\"%s\">更多資訊</a>",
+"up to date" => "最新的",
+"updates check is disabled" => "更新檢查已åœç”¨",
"Could not find category \"%s\"" => "找ä¸åˆ°åˆ†é¡žï¼š\"%s\""
);
diff --git a/lib/public/share.php b/lib/public/share.php
index c1eabee60d..e0aedf3569 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -991,7 +991,7 @@ class Share {
$row['path'] = '/Shared/'.basename($row['path']);
} else {
if (!isset($mounts[$row['storage']])) {
- $mounts[$row['storage']] = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
+ $mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']);
}
if ($mounts[$row['storage']]) {
$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
diff --git a/lib/request.php b/lib/request.php
index 4d8380eb9a..9f74cf9beb 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -11,10 +11,9 @@ class OC_Request {
* @brief Check overwrite condition
* @returns true/false
*/
- private static function isOverwriteCondition($type = '') {
+ private static function isOverwriteCondition() {
$regex = '/' . OC_Config::getValue('overwritecondaddr', '') . '/';
- return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1
- or ($type !== 'protocol' and OC_Config::getValue('forcessl', false));
+ return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1;
}
/**
@@ -28,7 +27,7 @@ class OC_Request {
if(OC::$CLI) {
return 'localhost';
}
- if(OC_Config::getValue('overwritehost', '') !== '' and self::isOverwriteCondition()) {
+ if(OC_Config::getValue('overwritehost', '')<>'' and self::isOverwriteCondition()) {
return OC_Config::getValue('overwritehost');
}
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -53,7 +52,7 @@ class OC_Request {
* Returns the server protocol. It respects reverse proxy servers and load balancers
*/
public static function serverProtocol() {
- if(OC_Config::getValue('overwriteprotocol', '') !== '' and self::isOverwriteCondition('protocol')) {
+ if(OC_Config::getValue('overwriteprotocol', '')<>'' and self::isOverwriteCondition()) {
return OC_Config::getValue('overwriteprotocol');
}
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
@@ -77,7 +76,7 @@ class OC_Request {
*/
public static function requestUri() {
$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
- if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) {
+ if (OC_Config::getValue('overwritewebroot', '') <> '' and self::isOverwriteCondition()) {
$uri = self::scriptName() . substr($uri, strlen($_SERVER['SCRIPT_NAME']));
}
return $uri;
@@ -92,7 +91,7 @@ class OC_Request {
*/
public static function scriptName() {
$name = $_SERVER['SCRIPT_NAME'];
- if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) {
+ if (OC_Config::getValue('overwritewebroot', '') <> '' and self::isOverwriteCondition()) {
$serverroot = str_replace("\\", '/', substr(__DIR__, 0, -4));
$suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot)));
$name = OC_Config::getValue('overwritewebroot', '') . $suburi;
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 5e58420143..69bebac050 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -18,20 +18,6 @@ class OC_TemplateLayout extends OC_Template {
$this->assign('bodyid', 'body-user');
}
- // Update notification
- if(OC_Config::getValue('updatechecker', true) === true) {
- $data=OC_Updater::check();
- if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
- $this->assign('updateAvailable', true);
- $this->assign('updateVersion', $data['versionstring']);
- $this->assign('updateLink', $data['web']);
- } else {
- $this->assign('updateAvailable', false); // No update available or not an admin user
- }
- } else {
- $this->assign('updateAvailable', false); // Update check is disabled
- }
-
// Add navigation entry
$this->assign( 'application', '', false );
$navigation = OC_App::getNavigation();
@@ -78,8 +64,25 @@ class OC_TemplateLayout extends OC_Template {
$root = $info[0];
$web = $info[1];
$file = $info[2];
+ $paths = explode('/', $file);
- $this->append( 'cssfiles', $web.'/'.$file . $versionParameter);
+ $in_root = false;
+ foreach(OC::$APPSROOTS as $app_root) {
+ if($root == $app_root['path']) {
+ $in_root = true;
+ break;
+ }
+ }
+
+ if($in_root ) {
+ $app = $paths[0];
+ unset($paths[0]);
+ $path = implode('/', $paths);
+ $this->append( 'cssfiles', OC_Helper::linkTo($app, $path) . $versionParameter);
+ }
+ else {
+ $this->append( 'cssfiles', $web.'/'.$file);
+ }
}
}
@@ -120,15 +123,20 @@ class OC_TemplateLayout extends OC_Template {
}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
}else{
- $app = substr($style, 0, strpos($style, '/'));
- $style = substr($style, strpos($style, '/')+1);
- $app_path = OC_App::getAppPath($app);
- $app_url = OC::$WEBROOT . '/index.php/apps/' . $app;
- if(self::appendIfExist($files, $app_path, $app_url, "$style$fext.css")) {
+ $append = false;
+ // or in apps?
+ foreach( OC::$APPSROOTS as $apps_dir)
+ {
+ if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) {
+ $append = true;
+ break;
+ }
+ elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) {
+ $append = true;
+ break;
+ }
}
- elseif(self::appendIfExist($files, $app_path, $app_url, "$style.css")) {
- }
- else {
+ if(! $append) {
echo('css file not found: style:'.$style.' formfactor:'.$fext
.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
die();
@@ -187,15 +195,18 @@ class OC_TemplateLayout extends OC_Template {
}else{
// Is it part of an app?
- $app = substr($script, 0, strpos($script, '/'));
- $script = substr($script, strpos($script, '/')+1);
- $app_path = OC_App::getAppPath($app);
- $app_url = OC_App::getAppWebPath($app);
- if(self::appendIfExist($files, $app_path, $app_url, "$script$fext.js")) {
- }
- elseif(self::appendIfExist($files, $app_path, $app_url, "$script.js")) {
+ $append = false;
+ foreach( OC::$APPSROOTS as $apps_dir) {
+ if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) {
+ $append = true;
+ break;
+ }
+ elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) {
+ $append = true;
+ break;
+ }
}
- else {
+ if(! $append) {
echo('js file not found: script:'.$script.' formfactor:'.$fext
.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
die();
diff --git a/lib/updater.php b/lib/updater.php
index 9081bfc4be..e7d33ac2bb 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -29,14 +29,7 @@ class OC_Updater{
* Check if a new version is available
*/
public static function check() {
-
- // Look up the cache - it is invalidated all 30 minutes
- if((OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
- return json_decode(OC_Appconfig::getValue('core', 'lastupdateResult'), true);
- }
-
- OC_Appconfig::setValue('core', 'lastupdatedat', time());
-
+ OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
if(OC_Appconfig::getValue('core', 'installedat', '')=='') {
OC_Appconfig::setValue('core', 'installedat', microtime(true));
}
@@ -72,9 +65,38 @@ class OC_Updater{
$tmp['url'] = $data->url;
$tmp['web'] = $data->web;
- // Cache the result
- OC_Appconfig::setValue('core', 'lastupdateResult', json_encode($data));
-
return $tmp;
}
-}
\ No newline at end of file
+
+ public static function ShowUpdatingHint() {
+ $l = OC_L10N::get('lib');
+
+ if(OC_Config::getValue('updatechecker', true)==true) {
+ $data=OC_Updater::check();
+ if(isset($data['version']) and $data['version']<>'') {
+ $txt='<span style="color:#AA0000; font-weight:bold;">'
+ .$l->t('%s is available. Get <a href="%s">more information</a>',
+ array($data['versionstring'], $data['web'])).'</span>';
+ }else{
+ $txt=$l->t('up to date');
+ }
+ }else{
+ $txt=$l->t('updates check is disabled');
+ }
+ return($txt);
+ }
+
+
+ /**
+ * do ownCloud update
+ */
+ public static function doUpdate() {
+
+ //update ownCloud core
+
+ //update all apps
+
+ //update version in config
+
+ }
+}
diff --git a/lib/user.php b/lib/user.php
index 226b716188..b19af94079 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -527,7 +527,7 @@ class OC_User {
foreach (self::$_usedBackends as $backend) {
$backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
if (is_array($backendDisplayNames)) {
- $displayNames = $displayNames + $backendDisplayNames;
+ $displayNames = array_merge($displayNames, $backendDisplayNames);
}
}
asort($displayNames);
diff --git a/lib/util.php b/lib/util.php
index 322e5cf909..38453c1ce9 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -38,7 +38,6 @@ class OC_Util {
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
//first set up the local "root" storage
- \OC\Files\Filesystem::initMounts();
if(!self::$rootMounted) {
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
self::$rootMounted=true;
@@ -221,63 +220,63 @@ class OC_Util {
if(!class_exists('ZipArchive')) {
$errors[]=array('error'=>'PHP module zip not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!class_exists('DOMDocument')) {
$errors[] = array('error' => 'PHP module dom not installed.',
'hint' => 'Please ask your server administrator to install the module.');
- $web_server_restart =true;
+ $web_server_restart = false;
}
if(!function_exists('xml_parser_create')) {
$errors[] = array('error' => 'PHP module libxml not installed.',
'hint' => 'Please ask your server administrator to install the module.');
- $web_server_restart =true;
+ $web_server_restart = false;
}
if(!function_exists('mb_detect_encoding')) {
$errors[]=array('error'=>'PHP module mb multibyte not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!function_exists('ctype_digit')) {
$errors[]=array('error'=>'PHP module ctype is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!function_exists('json_encode')) {
$errors[]=array('error'=>'PHP module JSON is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!function_exists('imagepng')) {
$errors[]=array('error'=>'PHP module GD is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!function_exists('gzencode')) {
$errors[]=array('error'=>'PHP module zlib is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!function_exists('iconv')) {
$errors[]=array('error'=>'PHP module iconv is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!function_exists('simplexml_load_string')) {
$errors[]=array('error'=>'PHP module SimpleXML is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(floatval(phpversion())<5.3) {
$errors[]=array('error'=>'PHP 5.3 is required.',
'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.'
.' PHP 5.2 is no longer supported by ownCloud and the PHP community.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if(!defined('PDO::ATTR_DRIVER_NAME')) {
$errors[]=array('error'=>'PHP PDO module is not installed.',
'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if (((strtolower(@ini_get('safe_mode')) == 'on')
|| (strtolower(@ini_get('safe_mode')) == 'yes')
@@ -285,12 +284,7 @@ class OC_Util {
|| (ini_get("safe_mode") == 1 ))) {
$errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.',
'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
- $web_server_restart=true;
- }
- if (get_magic_quotes_gpc() == 1 ) {
- $errors[]=array('error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.',
- 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
- $web_server_restart=true;
+ $web_server_restart= false;
}
if($web_server_restart) {
diff --git a/ocs/routes.php b/ocs/routes.php
index 5fcf05e4f9..81beae2f88 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -6,72 +6,16 @@
*/
// Config
-OC_API::register(
- 'get',
- '/config',
- array('OC_OCS_Config', 'apiConfig'),
- 'core',
- OC_API::GUEST_AUTH
- );
+OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'ocs', OC_API::GUEST_AUTH);
// Person
-OC_API::register(
- 'post',
- '/person/check',
- array('OC_OCS_Person', 'check'),
- 'core',
- OC_API::GUEST_AUTH
- );
+OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs', OC_API::GUEST_AUTH);
// Activity
-OC_API::register(
- 'get',
- '/activity',
- array('OC_OCS_Activity', 'activityGet'),
- 'core',
- OC_API::USER_AUTH
- );
+OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs', OC_API::USER_AUTH);
// Privatedata
-OC_API::register(
- 'get',
- '/privatedata/getattribute',
- array('OC_OCS_Privatedata', 'get'),
- 'core',
- OC_API::USER_AUTH,
- array('app' => '', 'key' => '')
- );
-OC_API::register(
- 'get',
- '/privatedata/getattribute/{app}',
- array('OC_OCS_Privatedata', 'get'),
- 'core',
- OC_API::USER_AUTH,
- array('key' => '')
- );
-OC_API::register(
- 'get',
- '/privatedata/getattribute/{app}/{key}',
- array('OC_OCS_Privatedata', 'get'),
- 'core',
- OC_API::USER_AUTH
- );
-OC_API::register(
- 'post',
- '/privatedata/setattribute/{app}/{key}',
- array('OC_OCS_Privatedata', 'set'),
- 'core',
- OC_API::USER_AUTH
- );
-OC_API::register(
- 'post',
- '/privatedata/deleteattribute/{app}/{key}',
- array('OC_OCS_Privatedata', 'delete'),
- 'core',
- OC_API::USER_AUTH
- );
+OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('app' => '', 'key' => ''));
+OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('key' => ''));
+OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH);
+OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH);
+OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH);
// cloud
-OC_API::register(
- 'get',
- '/cloud/capabilities',
- array('OC_OCS_Cloud', 'getCapabilities'),
- 'core',
- OC_API::USER_AUTH
- );
\ No newline at end of file
+OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH);
\ No newline at end of file
diff --git a/settings/js/personal.js b/settings/js/personal.js
index db18b2861a..7c879bcafe 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -86,9 +86,6 @@ $(document).ready(function(){
});
$("#languageinput").chosen();
- // Show only the not selectable optgroup
- // Choosen only shows optgroup-labels if there are options in the optgroup
- $(".languagedivider").remove();
$("#languageinput").change( function(){
// Serialize the data
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index a69bc9bed5..caf465bf67 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -10,7 +10,7 @@
"Unable to delete group" => "Ùشل إزالة المجموعة",
"Unable to delete user" => "Ùشل إزالة المستخدم",
"Language changed" => "تم تغيير اللغة",
-"Invalid request" => "طلب غير Ù…Ùهوم",
+"Invalid request" => "طلبك غير Ù…Ùهوم",
"Admins can't remove themself from the admin group" => "لا يستطيع المدير إزالة Øسابه من مجموعة المديرين",
"Unable to add user to group %s" => "Ùشل إضاÙØ© المستخدم الى المجموعة %s",
"Unable to remove user from group %s" => "Ùشل إزالة المستخدم من المجموعة %s",
@@ -23,13 +23,13 @@
"Updating...." => "جاري التØديث ...",
"Error while updating app" => "Øصل خطأ أثناء تØديث التطبيق",
"Updated" => "تم التØديث بنجاØ",
-"Saving..." => "جاري الØÙظ...",
+"Saving..." => "ØÙظ",
"deleted" => "تم الØØ°Ù",
"undo" => "تراجع",
"Unable to remove user" => "تعذر Øذ٠المستخدم",
"Groups" => "مجموعات",
"Group Admin" => "مدير المجموعة",
-"Delete" => "إلغاء",
+"Delete" => "ØØ°Ù",
"add group" => "اضاÙØ© مجموعة",
"A valid username must be provided" => "يجب ادخال اسم مستخدم صØÙŠØ",
"Error creating user" => "Øصل خطأ اثناء انشاء مستخدم",
@@ -84,14 +84,17 @@
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوÙر <strong>%s</strong>",
"Get the apps to sync your files" => "اØصل على التطبيقات لمزامنة ملÙاتك",
"Show First Run Wizard again" => "ابدأ خطوات بداية التشغيل من جديد",
-"Password" => "كلمة المرور",
+"Password" => "كلمات السر",
"Your password was changed" => "لقد تم تغيير كلمة السر",
"Unable to change your password" => "لم يتم تعديل كلمة السر بنجاØ",
"Current password" => "كلمات السر الØالية",
"New password" => "كلمات سر جديدة",
"Change password" => "عدل كلمة السر",
"Display Name" => "اسم الØساب",
-"Email" => "البريد الإلكترونى",
+"Your display name was changed" => "تم تغيير اسم Øسابك بنجاØ",
+"Unable to change your display name" => "تعذر تغيير اسم Øسابك",
+"Change display name" => "تغيير اسم الØساب",
+"Email" => "العنوان البريدي",
"Your email address" => "عنوانك البريدي",
"Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتÙعيل استرجاع كلمة المرور",
"Language" => "اللغة",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 0a6ca1ca60..b096fb902f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -41,7 +41,6 @@
"Display Name" => "Екранно име",
"Email" => "E-mail",
"Your email address" => "Ð’Ð°ÑˆÐ¸Ñ email адреÑ",
-"Fill in an email address to enable password recovery" => "Въведете е-поща за възÑтановÑване на паролата",
"Language" => "Език",
"Help translate" => "Помогнете Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð°",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index a1e724aa96..0f2799d9f3 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -9,7 +9,7 @@
"Unable to delete group" => "গোষà§à¦ ী মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো না ",
"Unable to delete user" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো না ",
"Language changed" => "à¦à¦¾à¦·à¦¾ পরিবরà§à¦¤à¦¨ করা হয়েছে",
-"Invalid request" => "অনà§à¦°à§‹à¦§à¦Ÿà¦¿ সঠিক নয়",
+"Invalid request" => "অনà§à¦°à§‹à¦§à¦Ÿà¦¿ যথাযথ নয়",
"Admins can't remove themself from the admin group" => "পà§à¦°à¦¶à¦¾à¦¸à¦•à¦¬à§ƒà¦¨à§à¦¦ তাদেরকে পà§à¦°à¦¶à¦¾à¦¸à¦• গোষà§à¦ ী থেকে মà§à¦›à§‡ ফেলতে পারবেন না",
"Unable to add user to group %s" => " %s গোষà§à¦ ীতে বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ যোগ করা সমà§à¦à¦¬ হলো না ",
"Unable to remove user from group %s" => "%s গোষà§à¦ ী থেকে বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦•à§‡ অপসারণ করা সমà§à¦à¦¬ হলো না",
@@ -20,7 +20,7 @@
"undo" => "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°",
"Groups" => "গোষà§à¦ ীসমূহ",
"Group Admin" => "গোষà§à¦ ী পà§à¦°à¦¶à¦¾à¦¸à¦•",
-"Delete" => "মà§à¦›à§‡",
+"Delete" => "মà§à¦›à§‡ ফেল",
"__language_name__" => "__language_name__",
"Security Warning" => "নিরাপতà§à¦¤à¦¾à¦œà¦¨à¦¿à¦¤ সতরà§à¦•à¦¤à¦¾",
"More" => "বেশী",
@@ -47,7 +47,7 @@
"Current password" => "বরà§à¦¤à¦®à¦¾à¦¨ কূটশবà§à¦¦",
"New password" => "নতà§à¦¨ কূটশবà§à¦¦",
"Change password" => "কূটশবà§à¦¦ পরিবরà§à¦¤à¦¨ করà§à¦¨",
-"Email" => "ইমেইল",
+"Email" => "ই-মেইল ",
"Your email address" => "আপনার ই-মেইল ঠিকানা",
"Fill in an email address to enable password recovery" => "কূটশবà§à¦¦ পূনরূদà§à¦§à¦¾à¦° সকà§à¦°à¦¿à§Ÿ করার জনà§à¦¯ ই-মেইল ঠিকানাটি পূরণ করà§à¦¨",
"Language" => "à¦à¦¾à¦·à¦¾",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 24d00b3232..6fd19a6c88 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -10,26 +10,26 @@
"Unable to delete group" => "No es pot eliminar el grup",
"Unable to delete user" => "No es pot eliminar l'usuari",
"Language changed" => "S'ha canviat l'idioma",
-"Invalid request" => "Sol·licitud no và lida",
+"Invalid request" => "Sol.licitud no và lida",
"Admins can't remove themself from the admin group" => "Els administradors no es poden eliminar del grup admin",
"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
"Couldn't update app." => "No s'ha pogut actualitzar l'aplicació.",
"Update to {appversion}" => "Actualitza a {appversion}",
"Disable" => "Desactiva",
-"Enable" => "Habilita",
+"Enable" => "Activa",
"Please wait...." => "Espereu...",
"Error" => "Error",
"Updating...." => "Actualitzant...",
"Error while updating app" => "Error en actualitzar l'aplicació",
"Updated" => "Actualitzada",
-"Saving..." => "Desant...",
+"Saving..." => "S'està desant...",
"deleted" => "esborrat",
"undo" => "desfés",
"Unable to remove user" => "No s'ha pogut eliminar l'usuari",
"Groups" => "Grups",
"Group Admin" => "Grup Admin",
-"Delete" => "Esborra",
+"Delete" => "Suprimeix",
"add group" => "afegeix grup",
"A valid username must be provided" => "Heu de facilitar un nom d'usuari và lid",
"Error creating user" => "Error en crear l'usuari",
@@ -91,6 +91,9 @@
"New password" => "Contrasenya nova",
"Change password" => "Canvia la contrasenya",
"Display Name" => "Nom a mostrar",
+"Your display name was changed" => "El vostre nom a mostrar ha canviat",
+"Unable to change your display name" => "No s'ha pogut canviar el vostre nom a mostrar",
+"Change display name" => "Canvia el nom a mostrar",
"Email" => "Correu electrònic",
"Your email address" => "Correu electrònic",
"Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 6fec132701..6e9d4e884d 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Nelze naÄÃst seznam z App Store",
"Authentication error" => "Chyba ověřenÃ",
-"Your display name has been changed." => "Vaše zobrazované jméno bylo změněno.",
"Unable to change display name" => "Nelze změnit zobrazované jméno",
"Group already exists" => "Skupina již existuje",
"Unable to add group" => "Nelze přidat skupinu",
@@ -92,6 +91,9 @@
"New password" => "Nové heslo",
"Change password" => "Změnit heslo",
"Display Name" => "Zobrazované jméno",
+"Your display name was changed" => "Vaše zobrazované jméno bylo změněno",
+"Unable to change your display name" => "Nelze změnit vaše zobrazované jméno",
+"Change display name" => "Změnit zobrazované jméno",
"Email" => "E-mail",
"Your email address" => "Vaše e-mailová adresa",
"Fill in an email address to enable password recovery" => "Pro povolenà změny hesla vyplňte adresu e-mailu",
@@ -103,7 +105,7 @@
"Create" => "Vytvořit",
"Default Storage" => "Výchozà úložiště",
"Unlimited" => "NeomezenÄ›",
-"Other" => "Jiný",
+"Other" => "Jiná",
"Storage" => "Úložiště",
"change display name" => "změnit zobrazované jméno",
"set new password" => "nastavit nové heslo",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0c9bb1109d..e74bf16fd5 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -83,15 +83,18 @@
"Commercial Support" => "Kommerciel support",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
"Get the apps to sync your files" => "Hent applikationerne for at synkronisere dine filer",
-"Show First Run Wizard again" => "Vis Første Kørsels Guiden igen.",
+"Show First Run Wizard again" => "Vis Første Kørsel Guiden igen",
"Password" => "Kodeord",
"Your password was changed" => "Din adgangskode blev ændret",
"Unable to change your password" => "Ude af stand til at ændre dit kodeord",
"Current password" => "Nuværende adgangskode",
-"New password" => "Nyt kodeord",
+"New password" => "Ny adgangskode",
"Change password" => "Skift kodeord",
"Display Name" => "Skærmnavn",
-"Email" => "E-mail",
+"Your display name was changed" => "Dit skærmnavn blev ændret",
+"Unable to change your display name" => "Kunne ikke skifte dit skærmnavn",
+"Change display name" => "Skift skærmnavn",
+"Email" => "Email",
"Your email address" => "Din emailadresse",
"Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
"Language" => "Sprog",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 12ef97ca75..1ff3e45f69 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
"Authentication error" => "Fehler bei der Anmeldung",
-"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
"Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
"Group already exists" => "Gruppe existiert bereits",
"Unable to add group" => "Gruppe konnte nicht angelegt werden",
@@ -11,7 +10,7 @@
"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
"Language changed" => "Sprache geändert",
-"Invalid request" => "Fehlerhafte Anfrage",
+"Invalid request" => "Ungültige Anfrage",
"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
@@ -92,6 +91,9 @@
"New password" => "Neues Passwort",
"Change password" => "Passwort ändern",
"Display Name" => "Anzeigename",
+"Your display name was changed" => "Dein Anzeigename wurde geändert",
+"Unable to change your display name" => "Das Ändern deines Anzeigenamens ist nicht möglich",
+"Change display name" => "Anzeigenamen ändern",
"Email" => "E-Mail",
"Your email address" => "Deine E-Mail-Adresse",
"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index febc67ef2d..b1f121aa97 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
-"Authentication error" => "Authentifizierungs-Fehler",
-"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
+"Authentication error" => "Fehler bei der Anmeldung",
"Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
"Group already exists" => "Die Gruppe existiert bereits",
"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
@@ -11,7 +10,7 @@
"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
"Language changed" => "Sprache geändert",
-"Invalid request" => "Ungültige Anforderung",
+"Invalid request" => "Ungültige Anfrage",
"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
@@ -92,6 +91,9 @@
"New password" => "Neues Passwort",
"Change password" => "Passwort ändern",
"Display Name" => "Anzeigename",
+"Your display name was changed" => "Ihr Anzeigename wurde geändert",
+"Unable to change your display name" => "Das Ändern Ihres Anzeigenamens ist nicht möglich",
+"Change display name" => "Anzeigenamen ändern",
"Email" => "E-Mail",
"Your email address" => "Ihre E-Mail-Adresse",
"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
@@ -100,7 +102,7 @@
"WebDAV" => "WebDAV",
"Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
"Login Name" => "Loginname",
-"Create" => "Erstellen",
+"Create" => "Anlegen",
"Default Storage" => "Standard-Speicher",
"Unlimited" => "Unbegrenzt",
"Other" => "Andere",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3558ae7298..9dfe20ae28 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Σφάλμα στην φόÏτωση της λίστας από το App Store",
"Authentication error" => "Σφάλμα πιστοποίησης",
-"Your display name has been changed." => "Το όνομα σας στην οθόνη άλλαξε. ",
"Unable to change display name" => "Δεν είναι δυνατή η αλλαγή του ονόματος εμφάνισης",
"Group already exists" => "Η ομάδα υπάÏχει ήδη",
"Unable to add group" => "Αδυναμία Ï€Ïοσθήκης ομάδας",
@@ -24,7 +23,7 @@
"Updating...." => "ΕνημÎÏωση...",
"Error while updating app" => "Σφάλμα κατά την ενημÎÏωση της εφαÏμογής",
"Updated" => "ΕνημεÏώθηκε",
-"Saving..." => "Γίνεται αποθήκευση...",
+"Saving..." => "Αποθήκευση...",
"deleted" => "διαγÏάφηκε",
"undo" => "αναίÏεση",
"Unable to remove user" => "Αδυναμία αφαίÏεση χÏήστη",
@@ -92,7 +91,10 @@
"New password" => "ÎÎο συνθηματικό",
"Change password" => "Αλλαγή συνθηματικοÏ",
"Display Name" => "Όνομα εμφάνισης",
-"Email" => "Ηλ. ταχυδÏομείο",
+"Your display name was changed" => "Το όνομα εμφάνισής σας άλλαξε",
+"Unable to change your display name" => "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας",
+"Change display name" => "Αλλαγή ονόματος εμφάνισης",
+"Email" => "Email",
"Your email address" => "Η διεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου σας",
"Fill in an email address to enable password recovery" => "ΣυμπληÏώστε μια διεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για να ενεÏγοποιηθεί η ανάκτηση συνθηματικοÏ",
"Language" => "Γλώσσα",
@@ -103,7 +105,7 @@
"Create" => "ΔημιουÏγία",
"Default Storage" => "Î ÏοκαθοÏισμÎνη Αποθήκευση ",
"Unlimited" => "ΑπεÏιόÏιστο",
-"Other" => "Άλλο",
+"Other" => "Άλλα",
"Storage" => "Αποθήκευση",
"change display name" => "αλλαγή ονόματος εμφάνισης",
"set new password" => "επιλογή νÎου κωδικοÏ",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 9fd1d5b320..732a5d30fc 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -24,18 +24,6 @@
"Delete" => "Forigi",
"__language_name__" => "Esperanto",
"Security Warning" => "Sekureca averto",
-"Cron" => "Cron",
-"Sharing" => "Kunhavigo",
-"Enable Share API" => "Kapabligi API-on por Kunhavigo",
-"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
-"Allow links" => "Kapabligi ligilojn",
-"Allow users to share items to the public with links" => "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile",
-"Allow resharing" => "Kapabligi rekunhavigon",
-"Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
-"Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
-"Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
-"Log" => "Protokolo",
-"Log level" => "Registronivelo",
"More" => "Pli",
"Less" => "Malpli",
"Version" => "Eldono",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 3db3169ca8..a1d03ae840 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error de autenticación",
-"Your display name has been changed." => "Su nombre fue cambiado.",
"Unable to change display name" => "Incapaz de cambiar el nombre",
"Group already exists" => "El grupo ya existe",
"Unable to add group" => "No se pudo añadir el grupo",
@@ -11,14 +10,14 @@
"Unable to delete group" => "No se pudo eliminar el grupo",
"Unable to delete user" => "No se pudo eliminar el usuario",
"Language changed" => "Idioma cambiado",
-"Invalid request" => "Petición no válida",
+"Invalid request" => "Solicitud no válida",
"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
"Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
"Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
"Couldn't update app." => "No se puedo actualizar la aplicacion.",
"Update to {appversion}" => "Actualizado a {appversion}",
"Disable" => "Desactivar",
-"Enable" => "Habilitar",
+"Enable" => "Activar",
"Please wait...." => "Espere por favor....",
"Error" => "Error",
"Updating...." => "Actualizando....",
@@ -89,10 +88,13 @@
"Your password was changed" => "Su contraseña ha sido cambiada",
"Unable to change your password" => "No se ha podido cambiar tu contraseña",
"Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña",
+"New password" => "Nueva contraseña:",
"Change password" => "Cambiar contraseña",
"Display Name" => "Nombre a mostrar",
-"Email" => "E-mail",
+"Your display name was changed" => "Su nombre fue cambiado",
+"Unable to change your display name" => "Incapaz de cambiar su nombre",
+"Change display name" => "Cambiar nombre",
+"Email" => "Correo electrónico",
"Your email address" => "Tu dirección de correo",
"Fill in an email address to enable password recovery" => "Escribe una dirección de correo electrónico para restablecer la contraseña",
"Language" => "Idioma",
@@ -104,7 +106,7 @@
"Default Storage" => "Almacenamiento Predeterminado",
"Unlimited" => "Ilimitado",
"Other" => "Otro",
-"Storage" => "Almacenamiento",
+"Storage" => "Alamacenamiento",
"change display name" => "Cambiar nombre a mostrar",
"set new password" => "Configurar nueva contraseña",
"Default" => "Predeterminado"
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f6e378177a..a1be54be1c 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -10,7 +10,7 @@
"Unable to delete group" => "No fue posible eliminar el grupo",
"Unable to delete user" => "No fue posible eliminar el usuario",
"Language changed" => "Idioma cambiado",
-"Invalid request" => "Pedido no válido",
+"Invalid request" => "Solicitud no válida",
"Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a ellos mismos del grupo administrador. ",
"Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
"Unable to remove user from group %s" => "No es posible eliminar al usuario del grupo %s",
@@ -91,7 +91,10 @@
"New password" => "Nueva contraseña:",
"Change password" => "Cambiar contraseña",
"Display Name" => "Nombre a mostrar",
-"Email" => "Correo Electrónico",
+"Your display name was changed" => "El nombre mostrado fue cambiado",
+"Unable to change your display name" => "No fue posible cambiar tu nombre",
+"Change display name" => "Cambiar nombre",
+"Email" => "Correo electrónico",
"Your email address" => "Tu dirección de e-mail",
"Fill in an email address to enable password recovery" => "Escribà una dirección de correo electrónico para restablecer la contraseña",
"Language" => "Idioma",
@@ -102,7 +105,7 @@
"Create" => "Crear",
"Default Storage" => "Almacenamiento Predeterminado",
"Unlimited" => "Ilimitado",
-"Other" => "Otros",
+"Other" => "Otro",
"Storage" => "Almacenamiento",
"change display name" => "Cambiar el nombre que se muestra",
"set new password" => "Configurar nueva contraseña",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 4065558324..b21b55f5ca 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
"Authentication error" => "Autentimise viga",
-"Your display name has been changed." => "Sinu kuvatav nimi on muudetud.",
"Unable to change display name" => "Ei saa muuta kuvatavat nime",
"Group already exists" => "Grupp on juba olemas",
"Unable to add group" => "Keela grupi lisamine",
@@ -18,7 +17,7 @@
"Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.",
"Update to {appversion}" => "Uuenda versioonile {appversion}",
"Disable" => "Lülita välja",
-"Enable" => "Luba",
+"Enable" => "Lülita sisse",
"Please wait...." => "Palun oota...",
"Error" => "Viga",
"Updating...." => "Uuendamine...",
@@ -92,6 +91,9 @@
"New password" => "Uus parool",
"Change password" => "Muuda parooli",
"Display Name" => "Näidatav nimi",
+"Your display name was changed" => "Sinu kuvatav nimi muutus",
+"Unable to change your display name" => "Ei suuda muuta kuvatavat nime",
+"Change display name" => "Muuda näidatavat nime",
"Email" => "E-post",
"Your email address" => "Sinu e-posti aadress",
"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 9982e9af9a..ed3500c5b7 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -10,7 +10,7 @@
"Unable to delete group" => "Ezin izan da taldea ezabatu",
"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
"Language changed" => "Hizkuntza aldatuta",
-"Invalid request" => "Baliogabeko eskaera",
+"Invalid request" => "Baliogabeko eskaria",
"Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
@@ -91,7 +91,10 @@
"New password" => "Pasahitz berria",
"Change password" => "Aldatu pasahitza",
"Display Name" => "Bistaratze Izena",
-"Email" => "E-posta",
+"Your display name was changed" => "Zure bistaratze izena aldatu da",
+"Unable to change your display name" => "Ezin izan da zure bistaratze izena aldatu",
+"Change display name" => "Aldatu bistaratze izena",
+"Email" => "E-Posta",
"Your email address" => "Zure e-posta",
"Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
"Language" => "Hizkuntza",
@@ -102,7 +105,7 @@
"Create" => "Sortu",
"Default Storage" => "Lehenetsitako Biltegiratzea",
"Unlimited" => "Mugarik gabe",
-"Other" => "Bestelakoa",
+"Other" => "Besteak",
"Storage" => "Biltegiratzea",
"change display name" => "aldatu bistaratze izena",
"set new password" => "ezarri pasahitz berria",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 1abb70f27a..8a097d64b0 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -10,7 +10,7 @@
"Unable to delete group" => "Øذ٠گروه امکان پذیر نیست",
"Unable to delete user" => "Øذ٠کاربر امکان پذیر نیست",
"Language changed" => "زبان تغییر کرد",
-"Invalid request" => "درخواست نامعتبر",
+"Invalid request" => "درخواست غیر قابل قبول",
"Admins can't remove themself from the admin group" => "مدیران نمی توانند خود را از گروه مدیریت Øذ٠کنند",
"Unable to add user to group %s" => "امکان اÙزودن کاربر به گروه %s نیست",
"Unable to remove user from group %s" => "امکان Øذ٠کاربر از گروه %s نیست",
@@ -23,13 +23,13 @@
"Updating...." => "در Øال بروز رسانی...",
"Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
"Updated" => "بروز رسانی انجام شد",
-"Saving..." => "در Øال ذخیره سازی...",
+"Saving..." => "درØال ذخیره ...",
"deleted" => "Øذ٠شده",
"undo" => "بازگشت",
"Unable to remove user" => "Øذ٠کاربر امکان پذیر نیست",
"Groups" => "گروه ها",
"Group Admin" => "گروه مدیران",
-"Delete" => "ØØ°Ù",
+"Delete" => "پاک کردن",
"add group" => "اÙزودن گروه",
"A valid username must be provided" => "نام کاربری صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود",
"Error creating user" => "خطا در ایجاد کاربر",
@@ -58,7 +58,6 @@
"Security" => "امنیت",
"Enforce HTTPS" => "وادار کردن HTTPS",
"Enforces the clients to connect to ownCloud via an encrypted connection." => "وادار کردن مشتریان برای ارتباط با ownCloud از طریق رمزگذاری ارتباط",
-"Log" => "کارنامه",
"More" => "بیش‌تر",
"Less" => "کم‌تر",
"Version" => "نسخه",
@@ -85,7 +84,10 @@
"New password" => "گذرواژه جدید",
"Change password" => "تغییر گذر واژه",
"Display Name" => "نام نمایشی",
-"Email" => "ایمیل",
+"Your display name was changed" => "نام نمایشی شما تغییر یاÙت",
+"Unable to change your display name" => "امکان تغییر نام نمایشی شما وجود ندارد",
+"Change display name" => "تغییر نام نمایشی",
+"Email" => "پست الکترونیکی",
"Your email address" => "پست الکترونیکی شما",
"Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید تا بازیابی گذرواژه Ùعال شود",
"Language" => "زبان",
@@ -95,7 +97,7 @@
"Create" => "ایجاد کردن",
"Default Storage" => "ذخیره سازی پیش Ùرض",
"Unlimited" => "نامØدود",
-"Other" => "دیگر",
+"Other" => "سایر",
"Storage" => "ØاÙظه",
"change display name" => "تغییر نام نمایشی",
"set new password" => "تنظیم کلمه عبور جدید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index f2d7d33358..74a8157a7f 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
-"Authentication error" => "Tunnistautumisvirhe",
-"Your display name has been changed." => "Näyttönimesi on muutettu.",
+"Authentication error" => "Todennusvirhe",
"Unable to change display name" => "Näyttönimen muuttaminen epäonnistui",
"Group already exists" => "Ryhmä on jo olemassa",
"Unable to add group" => "Ryhmän lisäys epäonnistui",
@@ -79,7 +78,10 @@
"New password" => "Uusi salasana",
"Change password" => "Vaihda salasana",
"Display Name" => "Näyttönimi",
-"Email" => "Sähköpostiosoite",
+"Your display name was changed" => "Näyttönimesi muutettiin",
+"Unable to change your display name" => "Näyttönimen muuttaminen epäonnistui",
+"Change display name" => "Muuta näyttönimeä",
+"Email" => "Sähköposti",
"Your email address" => "Sähköpostiosoitteesi",
"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
"Language" => "Kieli",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 0067236bad..efc2de893d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
"Authentication error" => "Erreur d'authentification",
-"Your display name has been changed." => "Votre nom d'affichage a bien été modifié.",
"Unable to change display name" => "Impossible de modifier le nom d'affichage",
"Group already exists" => "Ce groupe existe déjà ",
"Unable to add group" => "Impossible d'ajouter le groupe",
@@ -24,7 +23,7 @@
"Updating...." => "Mise à jour...",
"Error while updating app" => "Erreur lors de la mise à jour de l'application",
"Updated" => "Mise à jour effectuée avec succès",
-"Saving..." => "Enregistrement...",
+"Saving..." => "Sauvegarde...",
"deleted" => "supprimé",
"undo" => "annuler",
"Unable to remove user" => "Impossible de retirer l'utilisateur",
@@ -92,7 +91,10 @@
"New password" => "Nouveau mot de passe",
"Change password" => "Changer de mot de passe",
"Display Name" => "Nom affiché",
-"Email" => "Adresse mail",
+"Your display name was changed" => "Votre nom d'affichage a bien été modifié",
+"Unable to change your display name" => "Impossible de modifier votre nom d'affichage",
+"Change display name" => "Changer le nom affiché",
+"Email" => "E-mail",
"Your email address" => "Votre adresse e-mail",
"Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
"Language" => "Langue",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index a6c5018626..f7472fd872 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Non foi posÃbel cargar a lista desde a App Store",
"Authentication error" => "Produciuse un erro de autenticación",
-"Your display name has been changed." => "O seu nome visÃbel foi cambiado",
"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",
@@ -92,6 +91,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",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 5aeba49dcf..2e208b4576 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -14,9 +14,9 @@
"Unable to add user to group %s" => "×œ× × ×™×ª×Ÿ להוסיף משתמש לקבוצה %s",
"Unable to remove user from group %s" => "×œ× × ×™×ª×Ÿ להסיר משתמש מהקבוצה %s",
"Disable" => "בטל",
-"Enable" => "הפעלה",
+"Enable" => "הפעל",
"Error" => "שגי××”",
-"Saving..." => "שמירה…",
+"Saving..." => "שומר..",
"undo" => "ביטול",
"Groups" => "קבוצות",
"Group Admin" => "×ž× ×”×œ הקבוצה",
@@ -24,7 +24,6 @@
"__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 ×›× ×¨××” ××™× ×• עובד. ×× ×• ×ž×ž×œ×™×¦×™× ×‘×—×•× ×œ×”×’×“×™×¨ ×ת שרת ×”××™× ×˜×¨× ×˜ שלך בדרך שבה תיקיית ×”× ×ª×•× ×™× ×œ× ×ª×”×™×” ×–×ž×™× ×” עוד ×ו להעביר ×ת תיקיית ×”× ×ª×•× ×™× ×ž×—×•×¥ לספריית העל של שרת ×”××™× ×˜×¨× ×˜.",
-"Log" => "יומן",
"More" => "יותר",
"Less" => "פחות",
"Version" => "גרס×",
@@ -42,13 +41,13 @@
"Commercial Support" => "תמיכה בתשלו×",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> ×”×–×ž×™× ×™× ×œ×š",
"Get the apps to sync your files" => "השג ×ת ×”×פליקציות על ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ×ת ×”×§×‘×¦×™× ×©×œ×š",
-"Password" => "סיסמ×",
+"Password" => "ססמה",
"Your password was changed" => "הססמה שלך הוחלפה",
"Unable to change your password" => "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת הססמה שלך",
"Current password" => "ססמה × ×•×›×—×™×ª",
"New password" => "ססמה חדשה",
"Change password" => "×©×™× ×•×™ ססמה",
-"Email" => "דו×ר ××œ×§×˜×¨×•× ×™",
+"Email" => "דו×״ל",
"Your email address" => "כתובת הדו×״ל שלך",
"Fill in an email address to enable password recovery" => "× × ×œ×ž×œ× ×ת כתובת הדו×״ל שלך כדי ל×פשר שחזור ססמה",
"Language" => "פה",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 87ebf13f79..013cce3890 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -15,9 +15,6 @@
"Group Admin" => "Grupa Admin",
"Delete" => "Obriši",
"__language_name__" => "__ime_jezika__",
-"Cron" => "Cron",
-"Log" => "dnevnik",
-"More" => "više",
"Add your App" => "Dodajte vašu aplikaciju",
"Select an App" => "Odaberite Aplikaciju",
"See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 498e886077..a91e8ff491 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -17,7 +17,7 @@
"Couldn't update app." => "A program frissÃtése nem sikerült.",
"Update to {appversion}" => "FrissÃtés erre a verzióra: {appversion}",
"Disable" => "Letiltás",
-"Enable" => "engedélyezve",
+"Enable" => "Engedélyezés",
"Please wait...." => "Kérem várjon...",
"Error" => "Hiba",
"Updating...." => "FrissÃtés folyamatban...",
@@ -91,6 +91,9 @@
"New password" => "Az új jelszó",
"Change password" => "A jelszó megváltoztatása",
"Display Name" => "A megjelenÃtett név",
+"Your display name was changed" => "Az Ön megjelenÃtési neve megváltozott",
+"Unable to change your display name" => "Nem sikerült megváltoztatni az Ön megjelenÃtési nevét",
+"Change display name" => "A megjelenÃtési név módosÃtása",
"Email" => "Email",
"Your email address" => "Az Ön email cÃme",
"Fill in an email address to enable password recovery" => "Adja meg az email cÃmét, hogy jelszó-emlékeztetÅ‘t kérhessen, ha elfelejtette a jelszavát!",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index b9869e26f0..88cb8dbf9a 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -4,8 +4,6 @@
"Groups" => "Gruppos",
"Delete" => "Deler",
"__language_name__" => "Interlingua",
-"Log" => "Registro",
-"More" => "Plus",
"Add your App" => "Adder tu application",
"Select an App" => "Selectionar un app",
"Update" => "Actualisar",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index fb5ee229f1..2943e78a97 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
-"Authentication error" => "Galat saat autentikasi",
+"Authentication error" => "Galat autentikasi",
"Unable to change display name" => "Tidak dapat mengubah nama tampilan",
"Group already exists" => "Grup sudah ada",
"Unable to add group" => "Tidak dapat menambah grup",
@@ -17,7 +17,7 @@
"Couldn't update app." => "Tidak dapat memperbarui aplikasi.",
"Update to {appversion}" => "Perbarui ke {appversion}",
"Disable" => "Nonaktifkan",
-"Enable" => "aktifkan",
+"Enable" => "Aktifkan",
"Please wait...." => "Mohon tunggu....",
"Error" => "Galat",
"Updating...." => "Memperbarui....",
@@ -38,7 +38,7 @@
"Security Warning" => "Peringatan Keamanan",
"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." => "Mungkin direktori data dan berkas Anda dapat diakses dari internet. Berkas .htaccess yang disediakan oleh ownCloud tidak berfungsi. Kami sangat menyarankan Anda untuk mengonfigurasi webserver Anda agar direktori data tidak lagi dapat diakses atau pindahkan direktori data ke luar akar dokumen webserver.",
"Setup Warning" => "Peringatan Persiapan",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasi untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
"Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
"Module 'fileinfo' missing" => "Module 'fileinfo' tidak ada",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
@@ -91,6 +91,9 @@
"New password" => "Sandi baru",
"Change password" => "Ubah sandi",
"Display Name" => "Nama Tampilan",
+"Your display name was changed" => "Nama tampilan Anda telah diubah",
+"Unable to change your display name" => "Tidak dapat mengubah nama tampilan Anda",
+"Change display name" => "Ubah nama tampilan",
"Email" => "Email",
"Your email address" => "Alamat email Anda",
"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan sandi",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 74f8e17c78..c48db84b1e 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
"Authentication error" => "Errore di autenticazione",
-"Your display name has been changed." => "Il tuo nome visualizzato è stato cambiato.",
"Unable to change display name" => "Impossibile cambiare il nome visualizzato",
"Group already exists" => "Il gruppo esiste già ",
"Unable to add group" => "Impossibile aggiungere il gruppo",
@@ -92,7 +91,10 @@
"New password" => "Nuova password",
"Change password" => "Modifica password",
"Display Name" => "Nome visualizzato",
-"Email" => "Posta elettronica",
+"Your display name was changed" => "Il tuo nome visualizzato è stato cambiato",
+"Unable to change your display name" => "Impossibile cambiare il tuo nome visualizzato",
+"Change display name" => "Cambia il nome visualizzato",
+"Email" => "Email",
"Your email address" => "Il tuo indirizzo email",
"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
"Language" => "Lingua",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 2dd060cd94..c5aa0ddec7 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -10,14 +10,14 @@
"Unable to delete group" => "グループを削除ã§ãã¾ã›ã‚“",
"Unable to delete user" => "ユーザを削除ã§ãã¾ã›ã‚“",
"Language changed" => "言語ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ",
-"Invalid request" => "ä¸æ£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆ",
+"Invalid request" => "無効ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆã§ã™",
"Admins can't remove themself from the admin group" => "管ç†è€…ã¯è‡ªèº«ã‚’管ç†è€…グループã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。",
"Unable to add user to group %s" => "ユーザをグループ %s ã«è¿½åŠ ã§ãã¾ã›ã‚“",
"Unable to remove user from group %s" => "ユーザをグループ %s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“",
"Couldn't update app." => "アプリを更新出æ¥ã¾ã›ã‚“ã§ã—ãŸã€‚",
"Update to {appversion}" => "{appversion} ã«æ›´æ–°",
"Disable" => "無効",
-"Enable" => "有効化",
+"Enable" => "有効",
"Please wait...." => "ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。",
"Error" => "エラー",
"Updating...." => "æ›´æ–°ä¸....",
@@ -87,11 +87,14 @@
"Password" => "パスワード",
"Your password was changed" => "パスワードを変更ã—ã¾ã—ãŸ",
"Unable to change your password" => "パスワードを変更ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“",
-"Current password" => "Current password",
-"New password" => "æ–°ã—ã„パスワードを入力",
+"Current password" => "ç¾åœ¨ã®ãƒ‘スワード",
+"New password" => "æ–°ã—ã„パスワード",
"Change password" => "パスワードを変更",
"Display Name" => "表示å",
-"Email" => "メール",
+"Your display name was changed" => "ã‚ãªãŸã®è¡¨ç¤ºåを変更ã—ã¾ã—ãŸ",
+"Unable to change your display name" => "ã‚ãªãŸã®è¡¨ç¤ºåを変更ã§ãã¾ã›ã‚“",
+"Change display name" => "表示åを変更",
+"Email" => "Email",
"Your email address" => "ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹",
"Fill in an email address to enable password recovery" => "※パスワード回復を有効ã«ã™ã‚‹ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®å…¥åŠ›ãŒå¿…è¦ã§ã™",
"Language" => "言語",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index f6f4249e68..09de18ae1c 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბის სირვერჩáƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თრApp Store",
"Authentication error" => "áƒáƒ•áƒ—ენტიფიკáƒáƒªáƒ˜áƒ˜áƒ¡ შეცდáƒáƒ›áƒ",
-"Your display name has been changed." => "თქვენი დისფლეის სáƒáƒ®áƒ”ლი უკვე შეიცვáƒáƒšáƒ",
"Unable to change display name" => "დისფლეის სáƒáƒ®áƒ”ლის შეცვლრვერმáƒáƒ®áƒ”რხდáƒ",
"Group already exists" => "ჯგუფი უკვე áƒáƒ სებáƒáƒ‘ს",
"Unable to add group" => "ჯგუფის დáƒáƒ›áƒáƒ¢áƒ”ბრვერმáƒáƒ®áƒ”რხდáƒ",
@@ -28,7 +27,7 @@
"deleted" => "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜",
"undo" => "დáƒáƒ‘რუნებáƒ",
"Unable to remove user" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ",
-"Groups" => "ჯგუფები",
+"Groups" => "ჯგუფი",
"Group Admin" => "ჯგუფის áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი",
"Delete" => "წáƒáƒ¨áƒšáƒ",
"add group" => "ჯგუფის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ",
@@ -67,7 +66,7 @@
"Log" => "ლáƒáƒ’ი",
"Log level" => "ლáƒáƒ’ირების დáƒáƒœáƒ”",
"More" => "უფრრმეტი",
-"Less" => "უფრრნáƒáƒ™áƒšáƒ”ბი",
+"Less" => "naklebi",
"Version" => "ვერსიáƒ",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "წáƒáƒ მáƒáƒ”ბულირ<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> ვრცელდებრ<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფáƒáƒ გლებში.",
"Add your App" => "დáƒáƒáƒ›áƒáƒ¢áƒ” შენი áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ",
@@ -92,6 +91,9 @@
"New password" => "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜",
"Change password" => "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ",
"Display Name" => "დისპლეის სáƒáƒ®áƒ”ლი",
+"Your display name was changed" => "დისფლეის სáƒáƒ®áƒ”ლი შეიცვáƒáƒšáƒ",
+"Unable to change your display name" => "თქვენი დისფლეის სáƒáƒ®áƒ”ლის შეცვლრვერმáƒáƒ®áƒ”რხდáƒ",
+"Change display name" => "დისფლეის სáƒáƒ®áƒ”ლის შეცვლáƒ",
"Email" => "იმეილი",
"Your email address" => "თქვენი იმეილ მისáƒáƒ›áƒáƒ თი",
"Fill in an email address to enable password recovery" => "შეáƒáƒ•áƒ¡áƒ”თ იმეილ მისáƒáƒ›áƒáƒ თის ველი პáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒáƒ¦áƒ¡áƒáƒ“გენáƒáƒ“",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 2a139a0256..b5dbffad08 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -14,7 +14,7 @@
"Unable to add user to group %s" => "그룹 %sì— ì‚¬ìš©ìžë¥¼ ì¶”ê°€í• ìˆ˜ 없습니다.",
"Unable to remove user from group %s" => "그룹 %sì—ì„œ 사용ìžë¥¼ ì‚ì œí• ìˆ˜ 없습니다.",
"Disable" => "비활성화",
-"Enable" => "사용함",
+"Enable" => "활성화",
"Error" => "오류",
"Saving..." => "ì €ìž¥ 중...",
"deleted" => "ì‚ì œ",
@@ -26,9 +26,6 @@
"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." => "ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ 파ì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í• ìˆ˜ 있는 것 같습니다. ownCloudì—ì„œ ì œê³µí•œ .htaccess 파ì¼ì´ ìž‘ë™í•˜ì§€ 않습니다. 웹 서버를 다시 ì„¤ì •í•˜ì—¬ ë°ì´í„° ë””ë ‰í„°ë¦¬ì— ì ‘ê·¼í• ìˆ˜ ì—†ë„ë¡ í•˜ê±°ë‚˜ 문서 루트 바깥쪽으로 옮기는 ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.",
"Setup Warning" => "ì„¤ì • ê²½ê³ ",
-"Cron" => "í¬ë¡ ",
-"Log" => "로그",
-"Log level" => "로그 단계",
"More" => "ë” ì¤‘ìš”í•¨",
"Less" => "ëœ ì¤‘ìš”í•¨",
"Version" => "ë²„ì „",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 427e6568a4..793ae3d4dc 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -16,15 +16,6 @@
"Delete" => "Läschen",
"__language_name__" => "__language_name__",
"Security Warning" => "Sécherheets Warnung",
-"Cron" => "Cron",
-"Enable Share API" => "Share API aschalten",
-"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
-"Allow links" => "Links erlaben",
-"Allow resharing" => "Resharing erlaben",
-"Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
-"Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
-"Log" => "Log",
-"More" => "Méi",
"Add your App" => "Setz deng App bei",
"Select an App" => "Wiel eng Applikatioun aus",
"See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index dba1f92017..91782289e2 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -9,17 +9,13 @@
"Disable" => "IÅ¡jungti",
"Enable" => "Įjungti",
"Error" => "Klaida",
-"Saving..." => "Saugoma...",
+"Saving..." => "Saugoma..",
"undo" => "anuliuoti",
"Groups" => "GrupÄ—s",
"Delete" => "IÅ¡trinti",
"__language_name__" => "Kalba",
"Security Warning" => "Saugumo pranešimas",
"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." => "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur.",
-"Cron" => "Cron",
-"Sharing" => "Dalijimasis",
-"Log" => "Žurnalas",
-"Log level" => "Žurnalo išsamumas",
"More" => "Daugiau",
"Less" => "Mažiau",
"Add your App" => "PridÄ—ti programÄ—lÄ™",
@@ -33,7 +29,7 @@
"Current password" => "Dabartinis slaptažodis",
"New password" => "Naujas slaptažodis",
"Change password" => "Pakeisti slaptažodį",
-"Email" => "El. Paštas",
+"Email" => "El. paštas",
"Your email address" => "Jūsų el. pašto adresas",
"Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
"Language" => "Kalba",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 5864a392ac..f5fd8b76bc 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -10,7 +10,7 @@
"Unable to delete group" => "Nevar izdzēst grupu",
"Unable to delete user" => "Nevar izdzÄ“st lietotÄju",
"Language changed" => "Valoda tika nomainīta",
-"Invalid request" => "NederÄ«gs vaicÄjums",
+"Invalid request" => "Nederīgs pieprasījums",
"Admins can't remove themself from the admin group" => "Administratori nevar izņemt paši sevi no administratoru grupas",
"Unable to add user to group %s" => "Nevar pievienot lietotÄju grupai %s",
"Unable to remove user from group %s" => "Nevar izņemt lietotÄju no grupas %s",
@@ -91,6 +91,9 @@
"New password" => "Jauna parole",
"Change password" => "Mainīt paroli",
"Display Name" => "Redzamais vÄrds",
+"Your display name was changed" => "JÅ«su redzamais vÄrds tika mainÄ«ts",
+"Unable to change your display name" => "NevarÄ“ja mainÄ«t jÅ«su redzamo vÄrdu",
+"Change display name" => "MainÄ«t redzamo vÄrdu",
"Email" => "E-pasts",
"Your email address" => "JÅ«su e-pasta adrese",
"Fill in an email address to enable password recovery" => "Ievadiet e-pasta adresi, lai vÄ“lÄk varÄ“tu atgÅ«t paroli, ja bÅ«s nepiecieÅ¡amÄ«ba",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 902a8d2d6a..760b8912c2 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -9,7 +9,7 @@
"Unable to delete group" => "Ðеможе да избришам група",
"Unable to delete user" => "Ðеможам да избришам кориÑник",
"Language changed" => "Јазикот е Ñменет",
-"Invalid request" => "Ðеправилно барање",
+"Invalid request" => "неправилно барање",
"Admins can't remove themself from the admin group" => "ÐдминиÑтраторите неможе да Ñе избришат ÑебеÑи од админ групата",
"Unable to add user to group %s" => "Ðеможе да додадам кориÑник во група %s",
"Unable to remove user from group %s" => "Ðеможе да избришам кориÑник од група %s",
@@ -24,8 +24,6 @@
"__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 не фунционира. Силно препорачуваме да го иÑконфигурирате вашиот Ñервер за вашата папка Ñо податоци не е доÑтапна преку интернетт или премеÑтете ја надвор од коренот на веб Ñерверот.",
-"Log" => "ЗапиÑник",
-"Log level" => "Ðиво на логирање",
"More" => "Повеќе",
"Less" => "Помалку",
"Version" => "Верзија",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index a0b94f1a1b..a0022d5ba3 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -13,19 +13,16 @@
"Delete" => "Padam",
"__language_name__" => "_nama_bahasa_",
"Security Warning" => "Amaran keselamatan",
-"Log" => "Log",
-"Log level" => "Tahap Log",
-"More" => "Lanjutan",
"Add your App" => "Tambah apps anda",
"Select an App" => "Pilih aplikasi",
"See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
"Update" => "Kemaskini",
-"Password" => "Kata laluan",
+"Password" => "Kata laluan ",
"Unable to change your password" => "Gagal mengubah kata laluan anda ",
"Current password" => "Kata laluan semasa",
"New password" => "Kata laluan baru",
"Change password" => "Ubah kata laluan",
-"Email" => "Email",
+"Email" => "Emel",
"Your email address" => "Alamat emel anda",
"Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
"Language" => "Bahasa",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index fbb35baa74..25b67d6c01 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -13,7 +13,7 @@
"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
"Disable" => "Slå avBehandle ",
-"Enable" => "Aktiver",
+"Enable" => "Slå på",
"Error" => "Feil",
"Saving..." => "Lagrer...",
"deleted" => "slettet",
@@ -23,15 +23,6 @@
"Delete" => "Slett",
"__language_name__" => "__language_name__",
"Security Warning" => "Sikkerhetsadvarsel",
-"Cron" => "Cron",
-"Sharing" => "Deling",
-"Allow links" => "Tillat lenker",
-"Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
-"Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
-"Allow users to share with anyone" => "Tillat brukere å dele med alle",
-"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
-"Log" => "Logg",
-"Log level" => "Loggnivå",
"More" => "Mer",
"Less" => "Mindre",
"Version" => "Versjon",
@@ -51,7 +42,7 @@
"Current password" => "Nåværende passord",
"New password" => "Nytt passord",
"Change password" => "Endre passord",
-"Email" => "Epost",
+"Email" => "E-post",
"Your email address" => "Din e-postadresse",
"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
"Language" => "Språk",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d22b04ad57..26a0773e7b 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
"Authentication error" => "Authenticatie fout",
-"Your display name has been changed." => "Uw weergavenaam is gewijzigd.",
"Unable to change display name" => "Kon de weergavenaam niet wijzigen",
"Group already exists" => "Groep bestaat al",
"Unable to add group" => "Niet in staat om groep toe te voegen",
@@ -11,26 +10,26 @@
"Unable to delete group" => "Niet in staat om groep te verwijderen",
"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
"Language changed" => "Taal aangepast",
-"Invalid request" => "Ongeldige aanvraag",
+"Invalid request" => "Ongeldig verzoek",
"Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
"Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
"Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
"Couldn't update app." => "Kon de app niet bijwerken.",
"Update to {appversion}" => "Bijwerken naar {appversion}",
"Disable" => "Uitschakelen",
-"Enable" => "Activeer",
+"Enable" => "Inschakelen",
"Please wait...." => "Even geduld aub....",
"Error" => "Fout",
"Updating...." => "Bijwerken....",
"Error while updating app" => "Fout bij bijwerken app",
"Updated" => "Bijgewerkt",
-"Saving..." => "Opslaan",
+"Saving..." => "Aan het bewaren.....",
"deleted" => "verwijderd",
"undo" => "ongedaan maken",
"Unable to remove user" => "Kon gebruiker niet verwijderen",
"Groups" => "Groepen",
"Group Admin" => "Groep beheerder",
-"Delete" => "Verwijder",
+"Delete" => "verwijderen",
"add group" => "toevoegen groep",
"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
"Error creating user" => "Fout bij aanmaken gebruiker",
@@ -40,7 +39,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." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.",
"Setup Warning" => "Instellingswaarschuwing",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+"Please double check the <a href='%s'>installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
"Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
"Locale not working" => "Taalbestand werkt niet",
@@ -89,9 +88,12 @@
"Your password was changed" => "Je wachtwoord is veranderd",
"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
"Current password" => "Huidig wachtwoord",
-"New password" => "Nieuw",
+"New password" => "Nieuw wachtwoord",
"Change password" => "Wijzig wachtwoord",
"Display Name" => "Weergavenaam",
+"Your display name was changed" => "Uw weergavenaam is gewijzigd",
+"Unable to change your display name" => "Kon de weergavenaam niet wijzigen",
+"Change display name" => "Wijzig weergavenaam",
"Email" => "E-mailadres",
"Your email address" => "Uw e-mailadres",
"Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren",
@@ -103,7 +105,7 @@
"Create" => "Creëer",
"Default Storage" => "Default opslag",
"Unlimited" => "Ongelimiteerd",
-"Other" => "Anders",
+"Other" => "Andere",
"Storage" => "Opslag",
"change display name" => "wijzig weergavenaam",
"set new password" => "Instellen nieuw wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 0e4d0a66a1..cee3ecaeac 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,111 +1,28 @@
<?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
-"Authentication error" => "Autentiseringsfeil",
-"Your display name has been changed." => "Visningsnamnet ditt er endra.",
-"Unable to change display name" => "Klarte ikkje å endra visningsnamnet",
-"Group already exists" => "Gruppa finst allereie",
-"Unable to add group" => "Klarte ikkje å leggja til gruppa",
-"Could not enable app. " => "Klarte ikkje å aktivera app-en.",
+"Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
+"Authentication error" => "Feil i autentisering",
"Email saved" => "E-postadresse lagra",
"Invalid email" => "Ugyldig e-postadresse",
-"Unable to delete group" => "Klarte ikkje å sletta gruppa",
-"Unable to delete user" => "Klarte ikkje å sletta brukaren",
"Language changed" => "Språk endra",
"Invalid request" => "Ugyldig førespurnad",
-"Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
-"Unable to add user to group %s" => "Klarte ikkje å leggja til brukaren til gruppa %s",
-"Unable to remove user from group %s" => "Klarte ikkje å fjerna brukaren frå gruppa %s",
-"Couldn't update app." => "Klarte ikkje å oppdatera app-en.",
-"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå av",
"Enable" => "Slå på",
-"Please wait...." => "Ver venleg og vent …",
"Error" => "Feil",
-"Updating...." => "Oppdaterer …",
-"Error while updating app" => "Feil ved oppdatering av app",
-"Updated" => "Oppdatert",
-"Saving..." => "Lagrar …",
-"deleted" => "sletta",
-"undo" => "angra",
-"Unable to remove user" => "Klarte ikkje å fjerna brukaren",
"Groups" => "Grupper",
-"Group Admin" => "Gruppestyrar",
"Delete" => "Slett",
-"add group" => "legg til gruppe",
-"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
-"Error creating user" => "Feil ved oppretting av brukar",
-"A valid password must be provided" => "Du må oppgje eit gyldig passord",
"__language_name__" => "Nynorsk",
-"Security Warning" => "Tryggleiksåtvaring",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rår sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frå dokumentrota til tenaren.",
-"Setup Warning" => "Oppsettsåtvaring",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
-"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar.",
-"Locale not working" => "Regionaldata fungerer ikkje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s.",
-"Internet connection not working" => "Nettilkoplinga fungerer ikkje",
-"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." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet.",
-"Sharing" => "Deling",
-"Enable Share API" => "Skru på API-et for deling",
-"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
-"Allow links" => "Tillat lenkjer",
-"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
-"Allow resharing" => "Tillat vidaredeling",
-"Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
-"Allow users to share with anyone" => "La brukarar dela med kven som helst",
-"Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
-"Security" => "Tryggleik",
-"Enforce HTTPS" => "Krev HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Krev at klientar koplar til ownCloud med ei kryptert tilkopling.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga.",
-"Log" => "Logg",
-"Log level" => "Log nivå",
-"More" => "Meir",
-"Less" => "Mindre",
-"Version" => "Utgåve",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Legg til din app",
-"More Apps" => "Fleire app-ar",
"Select an App" => "Vel ein applikasjon",
-"See application page at apps.owncloud.com" => "Sjå applikasjonssida på apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
"Update" => "Oppdater",
-"User Documentation" => "Brukardokumentasjon",
-"Administrator Documentation" => "Administratordokumentasjon",
-"Online Documentation" => "Dokumentasjon på nett",
-"Forum" => "Forum",
-"Bugtracker" => "Feilsporar",
-"Commercial Support" => "Betalt brukarstøtte",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
-"Get the apps to sync your files" => "FÃ¥ app-ar som kan synkronisera filene dine",
-"Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
"Password" => "Passord",
-"Your password was changed" => "Passordet ditt er endra",
"Unable to change your password" => "Klarte ikkje å endra passordet",
"Current password" => "Passord",
"New password" => "Nytt passord",
"Change password" => "Endra passord",
-"Display Name" => "Visningsnamn",
-"Email" => "E-post",
-"Your email address" => "Di epost-adresse",
-"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å aktivera passordgjenoppretting",
+"Email" => "Epost",
+"Your email address" => "Din epost addresse",
+"Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
"Language" => "Språk",
-"Help translate" => "Hjelp oss å omsetja",
-"WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din",
-"Login Name" => "Innloggingsnamn",
+"Help translate" => "Hjelp oss å oversett",
"Create" => "Lag",
-"Default Storage" => "Standardlagring",
-"Unlimited" => "Ubegrensa",
-"Other" => "Anna",
-"Storage" => "Lagring",
-"change display name" => "endra visningsnamn",
-"set new password" => "lag nytt passord",
-"Default" => "Standard"
+"Other" => "Anna"
);
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 052974591a..589ccb09bd 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -23,13 +23,6 @@
"Delete" => "Escafa",
"__language_name__" => "__language_name__",
"Security Warning" => "Avertiment de securitat",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta.",
-"Sharing" => "Al partejar",
-"Enable Share API" => "Activa API partejada",
-"Log" => "Jornal",
-"More" => "Mai d'aquò",
"Add your App" => "Ajusta ton App",
"Select an App" => "Selecciona una applicacion",
"See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index e422601e2d..664d46ea3a 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -74,7 +74,7 @@
"Select an App" => "Zaznacz aplikacjÄ™",
"See application page at apps.owncloud.com" => "Zobacz stronÄ™ aplikacji na apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
-"Update" => "Aktualizuj",
+"Update" => "Zaktualizuj",
"User Documentation" => "Dokumentacja użytkownika",
"Administrator Documentation" => "Dokumentacja administratora",
"Online Documentation" => "Dokumentacja online",
@@ -91,7 +91,10 @@
"New password" => "Nowe hasło",
"Change password" => "Zmień hasło",
"Display Name" => "Wyświetlana nazwa",
-"Email" => "Email",
+"Your display name was changed" => "Twoja nazwa wyświetlana została zmieniona",
+"Unable to change your display name" => "Nie można zmienić twojej wyświetlanej nazwy",
+"Change display name" => "Zmień wyświetlaną nazwę",
+"Email" => "E-mail",
"Your email address" => "Twój adres e-mail",
"Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła",
"Language" => "Język",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index f1e45aab15..040afa84de 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,21 +1,20 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Não foi possÃvel carregar lista da App Store",
"Authentication error" => "Erro de autenticação",
-"Your display name has been changed." => "A exibição de seu nome foi alterada.",
"Unable to change display name" => "ImpossÃvel alterar nome de exibição",
"Group already exists" => "Grupo já existe",
"Unable to add group" => "Não foi possÃvel adicionar grupo",
"Could not enable app. " => "Não foi possÃvel habilitar aplicativo.",
-"Email saved" => "E-mail salvo",
+"Email saved" => "E-mail guardado",
"Invalid email" => "E-mail inválido",
"Unable to delete group" => "Não foi possÃvel remover grupo",
"Unable to delete user" => "Não foi possÃvel remover usuário",
"Language changed" => "Idioma alterado",
"Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Admins não podem ser removidos do grupo admin",
+"Admins can't remove themself from the admin group" => "Admins não podem se remover do grupo admin",
"Unable to add user to group %s" => "Não foi possÃvel adicionar usuário ao grupo %s",
"Unable to remove user from group %s" => "Não foi possÃvel remover usuário do grupo %s",
-"Couldn't update app." => "Não foi possÃvel atualizar a app.",
+"Couldn't update app." => "Não foi possÃvel atualizar o app.",
"Update to {appversion}" => "Atualizar para {appversion}",
"Disable" => "Desabilitar",
"Enable" => "Habilitar",
@@ -24,7 +23,7 @@
"Updating...." => "Atualizando...",
"Error while updating app" => "Erro ao atualizar aplicativo",
"Updated" => "Atualizado",
-"Saving..." => "Salvando...",
+"Saving..." => "Guardando...",
"deleted" => "excluÃdo",
"undo" => "desfazer",
"Unable to remove user" => "ImpossÃvel remover usuário",
@@ -39,8 +38,8 @@
"Security Warning" => "Aviso de Segurança",
"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." => "Seu diretório de dados e seus arquivos estão, provavelmente, acessÃveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessÃvel ou que você mova o diretório de dados para fora da raiz do servidor web.",
"Setup Warning" => "Aviso de Configuração",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira o <a href='%s'>guia de instalação</a>.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
+"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
"Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mÃdia (mime-type).",
"Locale not working" => "Localização não funcionando",
@@ -92,6 +91,9 @@
"New password" => "Nova senha",
"Change password" => "Alterar senha",
"Display Name" => "Nome de Exibição",
+"Your display name was changed" => "Seu nome de exibição foi alterado",
+"Unable to change your display name" => "ImpossÃvel alterar seu nome de exibição",
+"Change display name" => "Alterar nome de exibição",
"Email" => "E-mail",
"Your email address" => "Seu endereço de e-mail",
"Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 3e49675f79..b6538fbdd1 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
-"Authentication error" => "Erro na autenticação",
+"Authentication error" => "Erro de autenticação",
"Unable to change display name" => "Não foi possÃvel alterar o nome",
"Group already exists" => "O grupo já existe",
"Unable to add group" => "ImpossÃvel acrescentar o grupo",
@@ -10,7 +10,7 @@
"Unable to delete group" => "ImpossÃvel apagar grupo",
"Unable to delete user" => "ImpossÃvel apagar utilizador",
"Language changed" => "Idioma alterado",
-"Invalid request" => "Pedido Inválido",
+"Invalid request" => "Pedido inválido",
"Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
"Unable to add user to group %s" => "ImpossÃvel acrescentar utilizador ao grupo %s",
"Unable to remove user from group %s" => "ImpossÃvel apagar utilizador do grupo %s",
@@ -29,7 +29,7 @@
"Unable to remove user" => "Não foi possÃvel remover o utilizador",
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrador",
-"Delete" => "Eliminar",
+"Delete" => "Apagar",
"add group" => "Adicionar grupo",
"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
"Error creating user" => "Erro a criar utilizador",
@@ -84,14 +84,17 @@
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
"Get the apps to sync your files" => "Obtenha as aplicações para sincronizar os seus ficheiros",
"Show First Run Wizard again" => "Mostrar novamente Wizard de Arranque Inicial",
-"Password" => "Password",
+"Password" => "Palavra-chave",
"Your password was changed" => "A sua palavra-passe foi alterada",
"Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
"Current password" => "Palavra-chave actual",
"New password" => "Nova palavra-chave",
"Change password" => "Alterar palavra-chave",
"Display Name" => "Nome público",
-"Email" => "Email",
+"Your display name was changed" => "O seu nome foi alterado",
+"Unable to change your display name" => "Não foi possÃvel alterar o seu nome",
+"Change display name" => "Alterar nome",
+"Email" => "endereço de email",
"Your email address" => "O seu endereço de email",
"Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
"Language" => "Idioma",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index f48e0bae0a..e0729fcb71 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
-"Authentication error" => "Eroare la autentificare",
+"Authentication error" => "Eroare de autentificare",
"Group already exists" => "Grupul există deja",
"Unable to add group" => "Nu s-a putut adăuga grupul",
"Could not enable app. " => "Nu s-a putut activa aplicația.",
@@ -14,9 +14,9 @@
"Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
"Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
"Disable" => "Dezactivați",
-"Enable" => "Activare",
+"Enable" => "Activați",
"Error" => "Eroare",
-"Saving..." => "Se salvează...",
+"Saving..." => "Salvez...",
"deleted" => "șters",
"undo" => "Anulează ultima acțiune",
"Groups" => "Grupuri",
@@ -25,21 +25,6 @@
"__language_name__" => "_language_name_",
"Security Warning" => "Avertisment de securitate",
"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut.",
-"Sharing" => "Partajare",
-"Enable Share API" => "Activare API partajare",
-"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
-"Allow links" => "Pemite legături",
-"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
-"Allow resharing" => "Permite repartajarea",
-"Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
-"Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
-"Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
-"Log" => "Jurnal de activitate",
-"Log level" => "Nivel jurnal",
"More" => "Mai mult",
"Less" => "Mai puțin",
"Version" => "Versiunea",
@@ -57,7 +42,6 @@
"Bugtracker" => "Urmărire bug-uri",
"Commercial Support" => "Suport comercial",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
-"Get the apps to sync your files" => "Ia acum aplicatia pentru sincronizarea fisierelor ",
"Password" => "Parolă",
"Your password was changed" => "Parola a fost modificată",
"Unable to change your password" => "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index e10e022e8e..3a0be05ba1 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Загрузка из App Store запрещена",
-"Authentication error" => "Ошибка аутентификации",
-"Your display name has been changed." => "Ваше отображаемое Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ изменено.",
+"Authentication error" => "Ошибка авторизации",
"Unable to change display name" => "Ðевозможно изменить отображаемое имÑ",
"Group already exists" => "Группа уже ÑущеÑтвует",
"Unable to add group" => "Ðевозможно добавить группу",
@@ -11,7 +10,7 @@
"Unable to delete group" => "Ðевозможно удалить группу",
"Unable to delete user" => "Ðевозможно удалить пользователÑ",
"Language changed" => "Язык изменён",
-"Invalid request" => "Ðеправильный запроÑ",
+"Invalid request" => "Ðеверный запроÑ",
"Admins can't remove themself from the admin group" => "ÐдминиÑтратор не может удалить Ñам ÑÐµÐ±Ñ Ð¸Ð· группы admin",
"Unable to add user to group %s" => "Ðевозможно добавить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² группу %s",
"Unable to remove user from group %s" => "Ðевозможно удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы %s",
@@ -92,9 +91,12 @@
"New password" => "Ðовый пароль",
"Change password" => "Сменить пароль",
"Display Name" => "Отображаемое имÑ",
-"Email" => "E-mail",
+"Your display name was changed" => "Ваше отображаемое Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ изменено",
+"Unable to change your display name" => "Ðевозможно изменить Ваше отображаемое имÑ",
+"Change display name" => "Изменить отображаемое имÑ",
+"Email" => "e-mail",
"Your email address" => "Ваш Ð°Ð´Ñ€ÐµÑ Ñлектронной почты",
-"Fill in an email address to enable password recovery" => "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты чтобы поÑвилаÑÑŒ возможноÑÑ‚ÑŒ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ",
+"Fill in an email address to enable password recovery" => "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты, чтобы поÑвилаÑÑŒ возможноÑÑ‚ÑŒ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ",
"Language" => "Язык",
"Help translate" => "Помочь Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 88aa2c905a..94cd0abfe6 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,3 +1,68 @@
<?php $TRANSLATIONS = array(
-"deleted" => "удалено"
+"Unable to load list from App Store" => "Ðевозможно загрузить ÑпиÑок из App Store",
+"Authentication error" => "Ошибка авторизации",
+"Group already exists" => "Группа уже ÑущеÑтвует",
+"Unable to add group" => "Ðевозможно добавить группу",
+"Could not enable app. " => "Ðе удалоÑÑŒ запуÑтить приложение",
+"Email saved" => "Email Ñохранен",
+"Invalid email" => "Ðеверный email",
+"Unable to delete group" => "Ðевозможно удалить группу",
+"Unable to delete user" => "Ðевозможно удалить пользователÑ",
+"Language changed" => "Язык изменен",
+"Invalid request" => "Ðеверный запроÑ",
+"Admins can't remove themself from the admin group" => "ÐдминиÑтраторы не могут удалить Ñами ÑÐµÐ±Ñ Ð¸Ð· группы админиÑтраторов",
+"Unable to add user to group %s" => "Ðевозможно добавить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² группу %s",
+"Unable to remove user from group %s" => "Ðевозможно удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы %s",
+"Disable" => "Отключить",
+"Enable" => "Включить",
+"Error" => "Ошибка",
+"Saving..." => "Сохранение",
+"deleted" => "удалено",
+"undo" => "отменить дейÑтвие",
+"Groups" => "Группы",
+"Group Admin" => "Группа Admin",
+"Delete" => "Удалить",
+"__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 <a href='%s'>installation guides</a>." => "ПожалуйÑта проверте дважды <a href='%s'>гиды по уÑтановке</a>.",
+"More" => "Подробнее",
+"Less" => "Меньше",
+"Version" => "ВерÑиÑ",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Добавить Ваше приложение",
+"More Apps" => "Больше приложений",
+"Select an App" => "Выбрать приложение",
+"See application page at apps.owncloud.com" => "ОбратитеÑÑŒ к Ñтранице приложений на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"Update" => "Обновить",
+"User Documentation" => "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
+"Administrator Documentation" => "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора",
+"Online Documentation" => "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ online",
+"Forum" => "Форум",
+"Bugtracker" => "ОтÑлеживание ошибок",
+"Commercial Support" => "КоммерчеÑÐºÐ°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ð’Ñ‹ иÑпользовали <strong>%s</strong> из возможных <strong>%s</strong>",
+"Show First Run Wizard again" => "Вновь показать помощника первоначальной наÑтройки",
+"Password" => "Пароль",
+"Your password was changed" => "Ваш пароль был изменен",
+"Unable to change your password" => "Ðевозможно изменить Ваш пароль",
+"Current password" => "Текущий пароль",
+"New password" => "Ðовый пароль",
+"Change password" => "Изменить пароль",
+"Email" => "ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°",
+"Your email address" => "ÐÐ´Ñ€ÐµÑ Ð’Ð°ÑˆÐµÐ¹ Ñлектронной почты",
+"Fill in an email address to enable password recovery" => "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ",
+"Language" => "Язык",
+"Help translate" => "Помогите перевеÑти",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "ИÑпользуйте Ñтот Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ownCloud в Вашем файловом менеджере",
+"Create" => "Создать",
+"Default Storage" => "Хранилище по умолчанию",
+"Unlimited" => "Ðеограниченный",
+"Other" => "Другой",
+"Storage" => "Хранилище",
+"set new password" => "назначить новый пароль",
+"Default" => "По умолчанию"
);
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 4303b14c37..b40103ab9d 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -8,26 +8,19 @@
"Unable to delete group" => "කණ්ඩà·à¶ºà¶¸ මà·à¶šà·“මට නොහà·à¶š",
"Unable to delete user" => "පරිà·à·“ලකය෠මà·à¶šà·“මට නොහà·à¶š",
"Language changed" => "භà·à·‚à·à·€ à·à·€à¶±à·ƒà·Š කිරීම",
-"Invalid request" => "අවලංගු අයà·à¶¯à·”මක්",
+"Invalid request" => "අවලංගු අයදුම",
"Unable to add user to group %s" => "පරිà·à·“ලකය෠%s කණ්ඩà·à¶ºà¶¸à¶§ එකà¶à·” කළ නොහà·à¶š",
"Unable to remove user from group %s" => "පරිà·à·“ලකය෠%s කණ්ඩà·à¶ºà¶¸à·’න් ඉවà¶à·Š කළ නොහà·à¶š",
"Disable" => "අක්â€à¶»à·’ය කරන්න",
-"Enable" => "සක්â€à¶»à·’ය කරන්න",
+"Enable" => "ක්â€à¶»à·’යà¶à·Šà¶¸à¶š කරන්න",
"Error" => "දà·à·‚යක්",
"Saving..." => "සුරà·à¶šà·™à¶¸à·’න් පවà¶à·“...",
"undo" => "නිෂ්ප්â€à¶»à¶· කරන්න",
-"Groups" => "කණ්ඩà·à¶ºà¶¸à·Š",
+"Groups" => "සමූහය",
"Group Admin" => "කà·à¶«à·Šà¶© පරිපà·à¶½à¶š",
-"Delete" => "මක෠දමන්න",
+"Delete" => "මක෠දමනවà·",
"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." => "ඔබගේ දà¶à·Šà¶ ඩිරෙක්ටරිය හ෠ගොනුවලට අන්à¶à¶»à·Šà¶¢à·à¶½à¶ºà·™à¶±à·Š පිවිසිය à·„à·à¶š. ownCloud සපය෠ඇà¶à·’ .htaccess ගොනුව ක්â€à¶»à·’යà·à¶šà¶»à¶±à·Šà¶±à·š නà·à¶. අපි à¶à¶»à¶ºà·š කිය෠සිටිනුයේ නම්, මෙම දà¶à·Šà¶ හ෠ගොනු එසේ පිවිසීමට නොහà·à¶šà·’ වන ලෙස ඔබේ වෙබ් සේවà·à¶¯à·à¶ºà¶šà¶ºà· වින්â€à¶ºà·à·ƒ කරන ලෙස හ෠එම ඩිරෙක්ටරිය වෙබ් මූලයෙන් පිටà¶à¶§ ගෙනයන ලෙසය.",
-"Sharing" => "හුවමà·à¶»à·” කිරීම",
-"Allow 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" => "à¶à¶¸ කණ්ඩà·à¶ºà¶¸à·š අයෙකු හ෠පමණක් හුවමà·à¶»à·”වට අවසර දෙමි",
-"Log" => "ලà¶à·”à·€",
"More" => "à·€à·à¶©à·’",
"Less" => "අඩු",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමà·à¶¢à¶ºà·™à¶±à·Š</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේà¶à¶º </a>ලයිසන්ස් කර ඇà¶à·Šà¶à·š <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටà¶à·š.",
@@ -35,7 +28,7 @@
"More Apps" => "à¶à·€à¶à·Š යෙදුම්",
"Select an App" => "යෙදුමක් à¶à·œà¶»à¶±à·Šà¶±",
"Update" => "යà·à·€à¶à·Šà¶šà·à¶½ කිරීම",
-"Password" => "මුර පදය",
+"Password" => "මුරපදය",
"Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
"Unable to change your password" => "මුර පදය වෙනස් කළ නොහà·à¶šà·’ විය",
"Current password" => "à·€à¶à·Šà¶¸à¶±à·Š මුරපදය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 377af0011d..5b0b84f917 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
-"Authentication error" => "Chyba autentifikácie",
-"Your display name has been changed." => "Vaše zobrazované meno bolo zmenené.",
+"Authentication error" => "Chyba pri autentifikácii",
"Unable to change display name" => "Nemožno zmeniť zobrazované meno",
"Group already exists" => "Skupina už existuje",
"Unable to add group" => "Nie je možné pridať skupinu",
@@ -18,7 +17,7 @@
"Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
"Update to {appversion}" => "Aktualizovať na {appversion}",
"Disable" => "Zakázať",
-"Enable" => "Zapnúť",
+"Enable" => "Povoliť",
"Please wait...." => "ÄŒakajte prosÃm...",
"Error" => "Chyba",
"Updating...." => "Aktualizujem...",
@@ -30,7 +29,7 @@
"Unable to remove user" => "Nemožno odobraÅ¥ použÃvateľa",
"Groups" => "Skupiny",
"Group Admin" => "Správca skupiny",
-"Delete" => "Zmazať",
+"Delete" => "Odstrániť",
"add group" => "pridať skupinu",
"A valid username must be provided" => "MusÃte zadaÅ¥ platné použÃvateľské meno",
"Error creating user" => "Chyba pri vytváranà použÃvateľa",
@@ -92,6 +91,9 @@
"New password" => "Nové heslo",
"Change password" => "Zmeniť heslo",
"Display Name" => "Zobrazované meno",
+"Your display name was changed" => "Vaše zobrazované meno bolo zmenené",
+"Unable to change your display name" => "Nemožno zmeniť Vaše zobrazované meno",
+"Change display name" => "Zmeniť zobrazované meno",
"Email" => "Email",
"Your email address" => "Vaša emailová adresa",
"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 55d957cfa7..3ba3799a5d 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Ni mogoÄe naložiti seznama iz programskega srediÅ¡Äa",
-"Authentication error" => "Napaka med overjanjem",
-"Your display name has been changed." => "Prikazano ime je bilo spremenjeno.",
+"Unable to load list from App Store" => "Ni mogoÄe naložiti seznama iz srediÅ¡Äa App Store",
+"Authentication error" => "Napaka overitve",
"Unable to change display name" => "Prikazanega imena ni mogoÄe spremeniti.",
"Group already exists" => "Skupina že obstaja",
"Unable to add group" => "Skupine ni mogoÄe dodati",
@@ -92,7 +91,10 @@
"New password" => "Novo geslo",
"Change password" => "Spremeni geslo",
"Display Name" => "Prikazano ime",
-"Email" => "Elektronski naslov",
+"Your display name was changed" => "Prikazano ime je spremenjeno.",
+"Unable to change your display name" => "Prikazanega imena ni mogoÄe spremeniti.",
+"Change display name" => "Spremeni prikazano ime",
+"Email" => "Elektronska pošta",
"Your email address" => "Osebni elektronski naslov",
"Fill in an email address to enable password recovery" => "VpiÅ¡ite osebni elektronski naslov in s tem omogoÄite obnovitev gesla",
"Language" => "Jezik",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 03db0cd8fc..36ae95c825 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -9,6 +9,5 @@
"Update" => "Azhurno",
"Get the apps to sync your files" => "Merrni app-et për sinkronizimin e skedarëve tuaj",
"Password" => "Kodi",
-"New password" => "Kodi i ri",
-"Email" => "Email-i"
+"New password" => "Kodi i ri"
);
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 29e0661e44..86dc2a9272 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Грешка приликом учитавања ÑпиÑка из Складишта Програма",
-"Authentication error" => "Грешка при провери идентитета",
+"Authentication error" => "Грешка при аутентификацији",
"Unable to change display name" => "Ðе могу да променим име за приказ",
"Group already exists" => "Група већ поÑтоји",
"Unable to add group" => "Ðе могу да додам групу",
@@ -17,7 +17,7 @@
"Couldn't update app." => "Ðе могу да ажурирам апликацију.",
"Update to {appversion}" => "Ðжурирај на {appversion}",
"Disable" => "ИÑкључи",
-"Enable" => "Омогући",
+"Enable" => "Укључи",
"Please wait...." => "Сачекајте…",
"Error" => "Грешка",
"Updating...." => "Ðжурирам…",
@@ -85,6 +85,9 @@
"New password" => "Ðова лозинка",
"Change password" => "Измени лозинку",
"Display Name" => "Име за приказ",
+"Your display name was changed" => "Ваше име за приказ је промењено",
+"Unable to change your display name" => "Ðе могу да променим ваше име за приказ",
+"Change display name" => "Промени име за приказ",
"Email" => "Е-пошта",
"Your email address" => "Ваша адреÑа е-поште",
"Fill in an email address to enable password recovery" => "Ун",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index db4f63d221..ceff45a159 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
-"Authentication error" => "Fel vid autentisering",
+"Authentication error" => "Autentiseringsfel",
"Unable to change display name" => "Kan inte ändra visningsnamn",
"Group already exists" => "Gruppen finns redan",
"Unable to add group" => "Kan inte lägga till grupp",
@@ -42,22 +42,14 @@
"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
"Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut.",
"Sharing" => "Dela",
-"Enable Share API" => "Aktivera delat API",
-"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
"Allow links" => "Tillåt länkar",
-"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
"Allow resharing" => "Tillåt vidaredelning",
"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
"Allow users to share with anyone" => "Tillåt delning med alla",
"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
"Security" => "Säkerhet",
"Log" => "Logg",
-"Log level" => "Nivå på loggning",
"More" => "Mer",
"Less" => "Mindre",
"Version" => "Version",
@@ -84,6 +76,9 @@
"New password" => "Nytt lösenord",
"Change password" => "Ändra lösenord",
"Display Name" => "Visat namn",
+"Your display name was changed" => "Ditt visningsnamn har ändrats",
+"Unable to change your display name" => "Kan inte ändra ditt visningsnamn",
+"Change display name" => "Ändra visningsnamn",
"Email" => "E-post",
"Your email address" => "Din e-postadress",
"Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 052bb82365..12aa756320 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -13,13 +13,13 @@
"Unable to add user to group %s" => "கà¯à®´à¯ %s இல௠பயனாளரை சேரà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯",
"Unable to remove user from group %s" => "கà¯à®´à¯ %s இலிரà¯à®¨à¯à®¤à¯ பயனாளரை நீகà¯à®•à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯",
"Disable" => "இயலà¯à®®à¯ˆà®ªà¯à®ª",
-"Enable" => "இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•",
+"Enable" => "செயலறà¯à®±à®¤à®¾à®•à¯à®•à¯à®•",
"Error" => "வழà¯",
-"Saving..." => "சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯...",
+"Saving..." => "இயலà¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•",
"undo" => "à®®à¯à®©à¯ செயல௠நீகà¯à®•à®®à¯ ",
"Groups" => "கà¯à®´à¯à®•à¯à®•à®³à¯",
"Group Admin" => "கà¯à®´à¯ நிரà¯à®µà®¾à®•à®¿",
-"Delete" => "நீகà¯à®•à¯à®•",
+"Delete" => "அழிகà¯à®•",
"__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." => "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ தரவ௠அடைவ௠மறà¯à®±à¯à®®à¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கோபà¯à®ªà¯à®•à¯à®•à®³à¯ˆ பெரà¯à®®à¯à®ªà®¾à®²à¯à®®à¯ இணையதà¯à®¤à®¿à®©à¯‚டாக அணà¯à®•à®²à®¾à®®à¯. ownCloud இனால௠வழஙà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®± .htaccess கோபà¯à®ªà¯ வேலை செயà¯à®¯à®µà®¿à®²à¯à®²à¯ˆ. தரவ௠அடைவை நீணà¯à®Ÿ நேரதà¯à®¤à®¿à®±à¯à®•à¯ அணà¯à®•à®•à¯à®•à¯‚டியதாக உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ வலைய சேவையகதà¯à®¤à¯ˆ தகவமைகà¯à®•à¯à®®à®¾à®±à¯ நாஙà¯à®•à®³à¯ உறà¯à®¤à®¿à®¯à®¾à®• கூறà¯à®•à®¿à®±à¯‹à®®à¯ அலà¯à®²à®¤à¯ தரவ௠அடைவை வலைய சேவையக மூல ஆவணதà¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ வெளியே அகறà¯à®±à¯à®•. ",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 998e457778..f2bd27720f 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "ไม่สามารถโหลดรายà¸à¸²à¸£à¸ˆà¸²à¸ App Store ได้",
-"Authentication error" => "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในสิทธิ์à¸à¸²à¸£à¹€à¸‚้าใช้งาน",
+"Authentication error" => "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดเà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸ªà¸´à¸—ธิ์à¸à¸²à¸£à¹€à¸‚้าใช้งาน",
"Group already exists" => "มีà¸à¸¥à¸¸à¹ˆà¸¡à¸”ังà¸à¸¥à¹ˆà¸²à¸§à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸šà¸šà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§",
"Unable to add group" => "ไม่สามารถเพิ่มà¸à¸¥à¸¸à¹ˆà¸¡à¹„ด้",
"Could not enable app. " => "ไม่สามารถเปิดใช้งานà¹à¸à¸›à¹„ด้",
@@ -22,7 +22,7 @@
"Updating...." => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”ทข้à¸à¸¡à¸¹à¸¥...",
"Error while updating app" => "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในระหว่างà¸à¸²à¸£à¸à¸±à¸žà¹€à¸”ทà¹à¸à¸›à¸¯",
"Updated" => "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§",
-"Saving..." => "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸à¸‚้à¸à¸¡à¸¹à¸¥...",
+"Saving..." => "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึุà¸à¸‚้à¸à¸¡à¸¹à¸¥...",
"deleted" => "ลบà¹à¸¥à¹‰à¸§",
"undo" => "เลิà¸à¸—ำ",
"Groups" => "à¸à¸¥à¸¸à¹ˆà¸¡",
@@ -31,21 +31,6 @@
"__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 มีให้ไม่สามารถทำงานได้à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸«à¸¡à¸²à¸°à¸ªà¸¡ เราขà¸à¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸„ุณà¸à¸³à¸«à¸™à¸”ค่าเว็บเซิร์ฟเวà¸à¸£à¹Œà¹ƒà¸«à¸¡à¹ˆà¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸—ี่ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹€à¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¹„ม่สามารถเข้าถึงได้à¸à¸µà¸à¸•à¹ˆà¸à¹„ป หรืà¸à¸„ุณได้ย้ายไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¸—ี่ใช้เà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¹„ปà¸à¸¢à¸¹à¹ˆà¸ ายนà¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡ root ขà¸à¸‡à¹€à¸§à¹‡à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹à¸¥à¹‰à¸§",
-"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 ที่ตำà¹à¸«à¸™à¹ˆà¸‡ root ขà¸à¸‡ 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" => "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ด้เฉพาะà¸à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¹€à¸”ียวà¸à¸±à¸™à¹€à¸—่านั้น",
-"Log" => "บันทึà¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡",
-"Log level" => "ระดับà¸à¸²à¸£à¹€à¸à¹‡à¸šà¸šà¸±à¸™à¸—ึภlog",
"More" => "มาà¸",
"Less" => "น้à¸à¸¢",
"Version" => "รุ่น",
@@ -71,7 +56,7 @@
"New password" => "รหัสผ่านใหม่",
"Change password" => "เปลี่ยนรหัสผ่าน",
"Display Name" => "ชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹à¸ªà¸”ง",
-"Email" => "à¸à¸µà¹€à¸¡à¸¥",
+"Email" => "à¸à¸µà¹€à¸¡à¸¥à¹Œ",
"Your email address" => "ที่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณ",
"Fill in an email address to enable password recovery" => "à¸à¸£à¸à¸à¸—ี่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณเพื่à¸à¹€à¸›à¸´à¸”ให้มีà¸à¸²à¸£à¸à¸¹à¹‰à¸„ืนรหัสผ่านได้",
"Language" => "ภาษา",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 29f7504a52..1bd9dc3dac 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
-"Authentication error" => "Kimlik doğrulama hatası",
+"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",
@@ -17,7 +17,7 @@
"Couldn't update app." => "Uygulama güncellenemedi.",
"Update to {appversion}" => "{appversion} Güncelle",
"Disable" => "Etkin deÄŸil",
-"Enable" => "EtkinleÅŸtir",
+"Enable" => "Etkin",
"Please wait...." => "Lütfen bekleyin....",
"Error" => "Hata",
"Updating...." => "Güncelleniyor....",
@@ -91,6 +91,9 @@
"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 kurtarmayı etkinleştirmek için bir eposta adresi girin",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index d2b51e853f..4618a86ceb 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -10,7 +10,7 @@
"Unable to delete group" => "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ групу",
"Unable to delete user" => "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача",
"Language changed" => "Мова змінена",
-"Invalid request" => "Ðекоректний запит",
+"Invalid request" => "Помилковий запит",
"Admins can't remove themself from the admin group" => "ÐдмініÑтратор не може видалити Ñебе з групи адмінів",
"Unable to add user to group %s" => "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ кориÑтувача у групу %s",
"Unable to remove user from group %s" => "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача із групи %s",
@@ -91,6 +91,9 @@
"New password" => "Ðовий пароль",
"Change password" => "Змінити пароль",
"Display Name" => "Показати Ім'Ñ",
+"Your display name was changed" => "Ваше ім'Ñ Ð±ÑƒÐ»Ð¾ змінене",
+"Unable to change your display name" => "Ðеможливо змінити ваше зображене ім'Ñ",
+"Change display name" => "Змінити зображене ім'Ñ",
"Email" => "Ел.пошта",
"Your email address" => "Ваша адреÑа електронної пошти",
"Fill in an email address to enable password recovery" => "Введіть адреÑу електронної пошти Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index c9f7cd8633..156aae50e3 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -23,7 +23,7 @@
"Updating...." => "Äang cáºp nháºt...",
"Error while updating app" => "Lá»—i khi cáºp nháºt ứng dụng",
"Updated" => "Äã cáºp nháºt",
-"Saving..." => "Äang lÆ°u...",
+"Saving..." => "Äang tiến hà nh lÆ°u ...",
"deleted" => "đã xóa",
"undo" => "lùi lại",
"Groups" => "Nhóm",
@@ -32,20 +32,6 @@
"__language_name__" => "__Ngôn ngữ___",
"Security Warning" => "Cảnh bảo bảo máºt",
"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ThÆ° mục dữ liệu và những táºp tin của bạn có thể dá»… dà ng bị truy cáºp từ mạng. Táºp tin .htaccess do ownCloud cung cấp không hoạt Ä‘á»™ng. Chúng tôi Ä‘á» nghị bạn nên cấu hình lại máy chủ web để thÆ° mục dữ liệu không còn bị truy cáºp hoặc bạn nên di chuyển thÆ° mục dữ liệu ra bên ngoà i thÆ° mục gốc của máy chủ.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php đã được đăng ký tại má»™t dịch vụ webcron. Gá»i trang cron.php má»—i phút má»™t lần thông qua giao thức http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sá» dụng dịch vụ cron của hệ thống. Gá»i tệp tin cron.php má»—i phút má»™t lần.",
-"Sharing" => "Chia sẻ",
-"Enable Share API" => "Báºt chia sẻ API",
-"Allow apps to use the Share API" => "Cho phép các ứng dụng sỠdụng chia sẻ API",
-"Allow links" => "Cho phép liên kết",
-"Allow users to share items to the public with links" => "Cho phép ngÆ°á»i dùng chia sẻ công khai các mục bằng các liên kết",
-"Allow resharing" => "Cho phép chia sẻ lại",
-"Allow users to share items shared with them again" => "Cho phép ngÆ°á»i dùng chia sẻ lại những mục đã được chia sẻ",
-"Allow users to share with anyone" => "Cho phép ngÆ°á»i dùng chia sẻ vá»›i bất cứ ai",
-"Allow users to only share with users in their groups" => "Chỉ cho phép ngÆ°á»i dùng chia sẻ vá»›i những ngÆ°á»i dùng trong nhóm của há»",
-"Log" => "Log",
"More" => "hơn",
"Less" => "Ãt",
"Version" => "Phiên bản",
@@ -69,9 +55,12 @@
"Your password was changed" => "Máºt khẩu của bạn đã được thay đổi.",
"Unable to change your password" => "Không thể đổi máºt khẩu",
"Current password" => "Máºt khẩu cÅ©",
-"New password" => "Máºt khẩu má»›i",
+"New password" => "Máºt khẩu má»›i ",
"Change password" => "Äổi máºt khẩu",
"Display Name" => "Tên hiển thị",
+"Your display name was changed" => "Tên hiển thị của bạn đã được thay đổi",
+"Unable to change your display name" => "Không thể thay đổi tên hiển thị của bạn",
+"Change display name" => "Thay đổi tên hiển thị",
"Email" => "Email",
"Your email address" => "Email của bạn",
"Fill in an email address to enable password recovery" => "Nháºp địa chỉ email của bạn để khôi phục lại máºt khẩu",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index e2f59e72d0..e8b1527ef0 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "ä¸èƒ½ä»ŽApp Store ä¸åŠ 载列表",
-"Authentication error" => "验è¯é”™è¯¯",
+"Authentication error" => "认è¯é”™è¯¯",
"Unable to change display name" => "æ— æ³•æ›´æ”¹æ˜¾ç¤ºå称",
"Group already exists" => "群组已å˜åœ¨",
"Unable to add group" => "æœªèƒ½æ·»åŠ ç¾¤ç»„",
@@ -27,7 +27,7 @@
"deleted" => "åˆ é™¤",
"undo" => "撤销",
"Unable to remove user" => "æ— æ³•ç§»é™¤ç”¨æˆ·",
-"Groups" => "群组",
+"Groups" => "组",
"Group Admin" => "群组管ç†å‘˜",
"Delete" => "åˆ é™¤",
"add group" => "æ·»åŠ ç¾¤ç»„",
@@ -43,10 +43,6 @@
"Locale not working" => "区域设置未è¿ä½œ",
"Internet connection not working" => "互è”网连接未è¿ä½œ",
"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 æœåŠ¡æ³¨å†Œã€‚owncloud æ ¹ç”¨æˆ·å°†é€šè¿‡ http åè®®æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ cron.php。",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系统 cron æœåŠ¡ã€‚通过系统 cronjob æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ owncloud 文件夹下的 cron.php",
-"Sharing" => "分享",
"Enable Share API" => "å¼€å¯åˆ†äº«API",
"Allow apps to use the Share API" => "å…许应用使用分享API",
"Allow links" => "å…许链接",
@@ -58,7 +54,6 @@
"Security" => "安全",
"Enforce HTTPS" => "强制HTTPS",
"Enforces the clients to connect to ownCloud via an encrypted connection." => "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥ä¸ŽownCloud连接",
-"Log" => "日志",
"More" => "更多",
"Less" => "æ›´å°‘",
"Version" => "版本",
@@ -85,7 +80,10 @@
"New password" => "新密ç ",
"Change password" => "改å˜å¯†ç ",
"Display Name" => "显示å称",
-"Email" => "电å邮件",
+"Your display name was changed" => "您的显示å称已修改",
+"Unable to change your display name" => "æ— æ³•ä¿®æ”¹æ‚¨çš„æ˜¾ç¤ºå称",
+"Change display name" => "更改显示å称",
+"Email" => "Email",
"Your email address" => "ä½ çš„email地å€",
"Fill in an email address to enable password recovery" => "输入一个邮箱地å€ä»¥æ¿€æ´»å¯†ç æ¢å¤åŠŸèƒ½",
"Language" => "è¯è¨€",
@@ -96,7 +94,7 @@
"Create" => "新建",
"Default Storage" => "默认容é‡",
"Unlimited" => "æ— é™åˆ¶",
-"Other" => "其他",
+"Other" => "其他的",
"Storage" => "容é‡",
"change display name" => "更改显示å称",
"set new password" => "设置新的密ç ",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 9ccc52f65f..b076044b82 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "æ— æ³•ä»Žåº”ç”¨å•†åº—è½½å…¥åˆ—è¡¨",
-"Authentication error" => "认è¯å‡ºé”™",
+"Authentication error" => "认è¯é”™è¯¯",
"Unable to change display name" => "æ— æ³•ä¿®æ”¹æ˜¾ç¤ºå称",
"Group already exists" => "å·²å˜åœ¨è¯¥ç»„",
"Unable to add group" => "æ— æ³•æ·»åŠ ç»„",
@@ -10,20 +10,20 @@
"Unable to delete group" => "æ— æ³•åˆ é™¤ç»„",
"Unable to delete user" => "æ— æ³•åˆ é™¤ç”¨æˆ·",
"Language changed" => "è¯è¨€å·²ä¿®æ”¹",
-"Invalid request" => "æ— æ•ˆè¯·æ±‚",
+"Invalid request" => "éžæ³•è¯·æ±‚",
"Admins can't remove themself from the admin group" => "管ç†å‘˜ä¸èƒ½å°†è‡ªå·±ç§»å‡ºç®¡ç†ç»„。",
"Unable to add user to group %s" => "æ— æ³•æŠŠç”¨æˆ·æ·»åŠ åˆ°ç»„ %s",
"Unable to remove user from group %s" => "æ— æ³•ä»Žç»„%sä¸ç§»é™¤ç”¨æˆ·",
"Couldn't update app." => "æ— æ³•æ›´æ–° app。",
"Update to {appversion}" => "更新至 {appversion}",
"Disable" => "ç¦ç”¨",
-"Enable" => "å¼€å¯",
+"Enable" => "å¯ç”¨",
"Please wait...." => "请ç¨ç‰....",
"Error" => "错误",
"Updating...." => "æ£åœ¨æ›´æ–°....",
"Error while updating app" => "更新 app 时出错",
"Updated" => "已更新",
-"Saving..." => "ä¿å˜ä¸",
+"Saving..." => "æ£åœ¨ä¿å˜",
"deleted" => "å·²ç»åˆ 除",
"undo" => "撤销",
"Unable to remove user" => "æ— æ³•ç§»é™¤ç”¨æˆ·",
@@ -91,6 +91,9 @@
"New password" => "新密ç ",
"Change password" => "修改密ç ",
"Display Name" => "显示å称",
+"Your display name was changed" => "您的显示å称已修改",
+"Unable to change your display name" => "æ— æ³•ä¿®æ”¹æ‚¨çš„æ˜¾ç¤ºå称",
+"Change display name" => "修改显示å称",
"Email" => "电å邮件",
"Your email address" => "您的电å邮件",
"Fill in an email address to enable password recovery" => "填写电å邮件地å€ä»¥å¯ç”¨å¯†ç æ¢å¤åŠŸèƒ½",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 06c1fe0e7c..5fb21bfe08 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,7 +1,6 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "無法從 App Store 讀å–清單",
"Authentication error" => "èªè‰éŒ¯èª¤",
-"Your display name has been changed." => "已更改顯示å稱",
"Unable to change display name" => "無法更改顯示å稱",
"Group already exists" => "群組已å˜åœ¨",
"Unable to add group" => "ç¾¤çµ„å¢žåŠ å¤±æ•—",
@@ -49,7 +48,6 @@
"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 或應用程å¼çš„通知沒有辦法é‹ä½œã€‚é€éŽç¶²éš›ç¶²è·¯å˜å–檔案還有電å郵件通知å¯èƒ½ä¹Ÿç„¡æ³•é‹ä½œã€‚å¦‚æžœæƒ³è¦ ownCloud 完整的功能，建è°æ‚¨å°‡é€™è‡ºä¼ºæœå™¨é€£æŽ¥è‡³ç¶²éš›ç¶²è·¯ã€‚",
"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 æœå‹™ç•¶ä¸è¨»å†Šï¼Œè«‹æ¯åˆ†é˜é€éŽ HTTP å‘¼å« ownCloud æ ¹ç›®éŒ„ç•¶ä¸çš„ cron.php 一次。",
"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系統的 cron æœå‹™ï¼Œæ¯åˆ†é˜åŸ·è¡Œä¸€æ¬¡ owncloud 資料夾ä¸çš„ cron.php 。",
"Sharing" => "分享",
"Enable Share API" => "啟用分享 API",
@@ -83,7 +81,7 @@
"Bugtracker" => "Bugtracker",
"Commercial Support" => "商用支æ´",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目å‰å¯ç”¨ç©ºé–“為 <strong>%s</strong>",
-"Get the apps to sync your files" => "下載應用程å¼ä¾†åŒæ¥æ‚¨çš„檔案",
+"Get the apps to sync your files" => "ç²å–那些åŒæ¥æ‚¨çš„文件的應用程åº",
"Show First Run Wizard again" => "å†æ¬¡é¡¯ç¤ºé¦–次使用精éˆ",
"Password" => "密碼",
"Your password was changed" => "ä½ çš„å¯†ç¢¼å·²æ›´æ”¹",
@@ -92,7 +90,10 @@
"New password" => "新密碼",
"Change password" => "變更密碼",
"Display Name" => "顯示å稱",
-"Email" => "ä¿¡ç®±",
+"Your display name was changed" => "已更改顯示å稱",
+"Unable to change your display name" => "無法更改您的顯示å稱",
+"Change display name" => "更改顯示å稱",
+"Email" => "é›»å郵件",
"Your email address" => "您的電å郵件信箱",
"Fill in an email address to enable password recovery" => "請填入電å郵件信箱以便回復密碼",
"Language" => "語言",
diff --git a/settings/personal.php b/settings/personal.php
index 57a7e4ee9c..9bbc66c9b7 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -22,14 +22,8 @@ $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
$userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
$languageCodes=OC_L10N::findAvailableLanguages();
-// array of common languages
-$commonlangcodes = array(
- 'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
-);
-
$languageNames=include 'languageCodes.php';
$languages=array();
-$commonlanguages = array();
foreach($languageCodes as $lang) {
$l=OC_L10N::get('settings', $lang);
if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
@@ -40,12 +34,8 @@ foreach($languageCodes as $lang) {
$ln=array('code'=>$lang, 'name'=>$lang);
}
- // put apropriate languages into apropriate arrays, to print them sorted
- // used language -> common languages -> divider -> other languages
if ($lang === $userLang) {
$userLang = $ln;
- } elseif (in_array($lang, $commonlangcodes)) {
- $commonlanguages[]=$ln;
} else {
$languages[]=$ln;
}
@@ -56,6 +46,9 @@ usort( $languages, function ($a, $b) {
return strcmp($a['name'], $b['name']);
});
+//put the current language in the front
+array_unshift($languages, $userLang);
+
//links to clients
$clients = array(
'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
@@ -71,8 +64,6 @@ $tmpl->assign('usage_relative', $storageInfo['relative']);
$tmpl->assign('clients', $clients);
$tmpl->assign('email', $email);
$tmpl->assign('languages', $languages);
-$tmpl->assign('commonlanguages', $commonlanguages);
-$tmpl->assign('activelanguage', $userLang);
$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 28254b7aa1..182168ce9e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -233,7 +233,8 @@ endfor;?>
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
- <strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?><br/>
+ <strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?>
+ (<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/>
<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
</fieldset>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 6730787205..03073069ab 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -78,16 +78,11 @@ if($_['displayNameChangeSupported']) {
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Language'));?></strong></legend>
<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
- <option value="<?php p($_['activelanguage']['code']);?>"><?php p($_['activelanguage']['name']);?></option>
- <?php foreach($_['commonlanguages'] as $language):?>
- <option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
- <?php endforeach;?>
- <optgroup label="––––––––––"><option class="languagedivider">-</option></optgroup>
<?php foreach($_['languages'] as $language):?>
<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
<?php endforeach;?>
</select>
- <a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
+ <a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['languages'][0]['code']);?>/"
target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
</fieldset>
</form>
diff --git a/tests/lib/files/mount.php b/tests/lib/files/mount.php
new file mode 100644
index 0000000000..a3dc06cc66
--- /dev/null
+++ b/tests/lib/files/mount.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\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();
+ \OC\Files\Mount::clear();
+ }
+
+ public function testFind() {
+ $this->assertNull(\OC\Files\Mount::find('/'));
+
+ $rootMount = new \OC\Files\Mount(new Temporary(array()), '/');
+ $this->assertEquals($rootMount, \OC\Files\Mount::find('/'));
+ $this->assertEquals($rootMount, \OC\Files\Mount::find('/foo/bar'));
+
+ $storage = new Temporary(array());
+ $mount = new \OC\Files\Mount($storage, '/foo');
+ $this->assertEquals($rootMount, \OC\Files\Mount::find('/'));
+ $this->assertEquals($mount, \OC\Files\Mount::find('/foo/bar'));
+
+ $this->assertEquals(1, count(\OC\Files\Mount::findIn('/')));
+ new \OC\Files\Mount(new Temporary(array()), '/bar');
+ $this->assertEquals(2, count(\OC\Files\Mount::findIn('/')));
+
+ $id = $mount->getStorageId();
+ $this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
+
+ $mount2 = new \OC\Files\Mount($storage, '/foo/bar');
+ $this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findByStorageId($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::findByStorageId($id));
+ $this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($storageId));
+ $this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId(md5($storageId)));
+ }
+}
diff --git a/tests/lib/files/mount/manager.php b/tests/lib/files/mount/manager.php
deleted file mode 100644
index 154c35ccea..0000000000
--- a/tests/lib/files/mount/manager.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace Test\Files\Mount;
-
-use \OC\Files\Storage\Temporary;
-
-class LongId extends Temporary {
- public function getId() {
- return 'long:' . str_repeat('foo', 50) . parent::getId();
- }
-}
-
-class Manager extends \PHPUnit_Framework_TestCase {
- /**
- * @var \OC\Files\Mount\Manager
- */
- private $manager;
-
- public function setup() {
- $this->manager = new \OC\Files\Mount\Manager();
- }
-
- public function testFind() {
- $this->assertNull($this->manager->find('/'));
-
- $rootMount = new \OC\Files\Mount\Mount(new Temporary(array()), '/');
- $this->manager->addMount($rootMount);
- $this->assertEquals($rootMount, $this->manager->find('/'));
- $this->assertEquals($rootMount, $this->manager->find('/foo/bar'));
-
- $storage = new Temporary(array());
- $mount1 = new \OC\Files\Mount\Mount($storage, '/foo');
- $this->manager->addMount($mount1);
- $this->assertEquals($rootMount, $this->manager->find('/'));
- $this->assertEquals($mount1, $this->manager->find('/foo/bar'));
-
- $this->assertEquals(1, count($this->manager->findIn('/')));
- $mount2 = new \OC\Files\Mount\Mount(new Temporary(array()), '/bar');
- $this->manager->addMount($mount2);
- $this->assertEquals(2, count($this->manager->findIn('/')));
-
- $id = $mount1->getStorageId();
- $this->assertEquals(array($mount1), $this->manager->findByStorageId($id));
-
- $mount3 = new \OC\Files\Mount\Mount($storage, '/foo/bar');
- $this->manager->addMount($mount3);
- $this->assertEquals(array($mount1, $mount3), $this->manager->findByStorageId($id));
- }
-
- public function testLong() {
- $storage = new LongId(array());
- $mount = new \OC\Files\Mount\Mount($storage, '/foo');
- $this->manager->addMount($mount);
-
- $id = $mount->getStorageId();
- $storageId = $storage->getId();
- $this->assertEquals(array($mount), $this->manager->findByStorageId($id));
- $this->assertEquals(array($mount), $this->manager->findByStorageId($storageId));
- $this->assertEquals(array($mount), $this->manager->findByStorageId(md5($storageId)));
- }
-}
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index c7e51ccfa4..2237ee7d37 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -77,10 +77,10 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
}
public function testOC() {
- \OC\Files\Filesystem::clearMounts();
+ \OC\Files\Mount::clear();
$storage = new \OC\Files\Storage\Temporary(array());
$storage->file_put_contents('foo.txt', 'asd');
- \OC\Files\Filesystem::mount($storage, array(), '/');
+ new \OC\Files\Mount($storage, '/');
$this->assertTrue(file_exists('oc:///foo.txt'));
$this->assertEquals('asd', file_get_contents('oc:///foo.txt'));
--
GitLab
From 04b0843bb4484695ec6c4fb060a4ae4b3e8a996f Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 1 May 2013 01:43:56 +0200
Subject: [PATCH 120/304] fixed some tests
---
apps/files_encryption/tests/crypt.php | 9 ++++++---
apps/files_encryption/tests/keymanager.php | 7 +++++--
apps/files_encryption/tests/stream.php | 2 +-
apps/files_encryption/tests/util.php | 9 +++++++--
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 7f9572f426..4a85048ba4 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -21,7 +21,6 @@ use OCA\Encryption;
// This has to go here because otherwise session errors arise, and the private
// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
/**
* @note It would be better to use Mockery here for mocking out the session
@@ -37,7 +36,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// reset backend
\OC_User::useBackend('database');
- // set content for encrypting / decrypting in tests
+ // set content for encrypting / decrypting in tests
$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
$this->dataShort = 'hats';
$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
@@ -60,13 +59,17 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init($this->userId, '/');
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
}
function tearDown() {
}
- function testGenerateKey() {
+ function testGenerateKey() {
# TODO: use more accurate (larger) string length for test confirmation
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 81034be54b..33ca29997b 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -19,7 +19,7 @@ use OCA\Encryption;
// This has to go here because otherwise session errors arise, and the private
// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
+//\OC_User::login( 'admin', 'admin' );
class Test_Keymanager extends \PHPUnit_Framework_TestCase {
@@ -52,7 +52,10 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init( $this->userId, '/' );
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
-
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
}
function tearDown(){
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index ba82ac80ea..633cc9e4fc 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -1,4 +1,4 @@
-// <?php
+<?php
// /**
// * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
// * This file is licensed under the Affero General Public License version 3 or
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 0659b468a3..e3ec0860fa 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -24,8 +24,6 @@ $loader->register();
use \Mockery as m;
use OCA\Encryption;
-\OC_User::login( 'admin', 'admin' );
-
class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function setUp() {
@@ -62,6 +60,10 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::init( $this->userId, '/' );
\OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+
$mockView = m::mock('OC_FilesystemView');
$this->util = new Encryption\Util( $mockView, $this->userId );
@@ -75,6 +77,9 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
/**
* @brief test that paths set during User construction are correct
+ *
+ *
+ *
*/
function testKeyPaths() {
--
GitLab
From 9f8f052f0d429d24c91ae1f68f7a534cb50f3775 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 1 May 2013 01:52:06 +0200
Subject: [PATCH 121/304] merged files_trashbin
---
apps/files_trashbin/lib/trash.php | 395 +++++++++++++++++++++++-------
1 file changed, 309 insertions(+), 86 deletions(-)
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index f0b56eef01..88c71a75ab 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -39,14 +39,15 @@ class Trashbin {
$view = new \OC\Files\View('/'. $user);
if (!$view->is_dir('files_trashbin')) {
$view->mkdir('files_trashbin');
- $view->mkdir("files_trashbin/files");
- $view->mkdir("files_trashbin/versions");
- $view->mkdir("files_trashbin/keyfiles");
+ $view->mkdir('files_trashbin/files');
+ $view->mkdir('files_trashbin/versions');
+ $view->mkdir('files_trashbin/keyfiles');
+ $view->mkdir('files_trashbin/share-keys');
}
$path_parts = pathinfo($file_path);
- $deleted = $path_parts['basename'];
+ $filename = $path_parts['basename'];
$location = $path_parts['dirname'];
$timestamp = time();
$mime = $view->getMimeType('files'.$file_path);
@@ -62,45 +63,24 @@ class Trashbin {
$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
}
- $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
-
- if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
+ $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+
+ if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
$trashbinSize += $sizeOfAddedFiles;
$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));
+ $result = $query->execute(array($filename, $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/files/'.$deleted.'.d'.$timestamp);
+ $view->deleteAll('files_trashbin/files/'.$filename.'.d'.$timestamp);
\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
return;
}
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash',
array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
- 'trashPath' => \OC\Files\Filesystem::normalizePath($deleted.'.d'.$timestamp)));
-
- // Take care of file versions
- if ( \OCP\App::isEnabled('files_versions') ) {
- if ( $view->is_dir('files_versions/'.$file_path) ) {
- $trashbinSize += self::calculateSize(new \OC\Files\View('/'. $user.'/files_versions/'.$file_path));
- $view->rename('files_versions/'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp);
- } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($user, $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'], 'files_trashbin/versions/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
- }
- }
- }
-
- // Take care of encryption keys
- $keyfile = \OC\Files\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\Files\View('/'.$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);
- }
- }
+ 'trashPath' => \OC\Files\Filesystem::normalizePath($filename.'.d'.$timestamp)));
+
+ $trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
+ $trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
+
} else {
\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
}
@@ -111,15 +91,134 @@ class Trashbin {
}
+ /**
+ * Move file versions to trash so that they can be restored later
+ *
+ * @param \OC\Files\View $view
+ * @param $file_path path to original file
+ * @param $filename of deleted file
+ * @param $timestamp when the file was deleted
+ *
+ * @return size of stored versions
+ */
+ private static function retainVersions($view, $file_path, $filename, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_versions')) {
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $user = \OCP\User::getUser();
+ if ($view->is_dir('files_versions/' . $file_path)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path));
+ $view->rename('files_versions/' . $file_path, 'files_trashbin/versions/' . $filename . '.d' . $timestamp);
+ } else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) {
+ foreach ($versions as $v) {
+ $size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']);
+ $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+ }
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ return $size;
+ }
+
+ /**
+ * Move encryption keys to trash so that they can be restored later
+ *
+ * @param \OC\Files\View $view
+ * @param $file_path path to original file
+ * @param $filename of deleted file
+ * @param $timestamp when the file was deleted
+ *
+ * @return size of encryption keys
+ */
+ private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
+ $size = 0;
+
+ if (\OCP\App::isEnabled('files_encryption')) {
+
+ $user = \OCP\User::getUser();
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // retain key files
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path);
+
+ if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) {
+ $user = \OCP\User::getUser();
+ // move keyfiles
+ if ($view->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+ $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+ } else {
+ $size += $view->filesize($keyfile . '.key');
+ $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+ }
+ }
+
+ // retain share keys
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path);
+
+ if ($view->is_dir($sharekeys)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
+ $view->rename($sharekeys, 'files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+ } else {
+ // get local path to share-keys
+ $localShareKeysPath = $view->getLocalFile($sharekeys);
+
+ // handle share-keys
+ $matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
+ foreach ($matches as $src) {
+ // get source file parts
+ $pathinfo = pathinfo($src);
+
+ // we only want to keep the owners key so we can access the private key
+ $ownerShareKey = $filename . '.' . $user. '.shareKey';
+
+ // if we found the share-key for the owner, we need to move it to files_trashbin
+ if($pathinfo['basename'] == $ownerShareKey) {
+
+ // calculate size
+ $size += $view->filesize($sharekeys. '.' . $user. '.shareKey');
+
+ // move file
+ $view->rename($sharekeys. '.' . $user. '.shareKey', 'files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
+ } else {
+
+ // calculate size
+ $size += filesize($src);
+
+ // don't keep other share-keys
+ unlink($src);
+ }
+ }
+
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ return $size;
+ }
/**
* 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
- */
+ *
+ * @return bool
+ */
public static function restore($file, $filename, $timestamp) {
- $user = \OCP\User::getUser();
+
+ $user = \OCP\User::getUser();
$view = new \OC\Files\View('/'.$user);
$trashbinSize = self::getTrashbinSize($user);
@@ -157,8 +256,17 @@ class Trashbin {
// we need a extension in case a file/dir with the same name already exists
$ext = self::getUniqueExtension($location, $filename, $view);
$mtime = $view->filemtime($source);
- if( $view->rename($source, $target.$ext) ) {
- $view->touch($target.$ext, $mtime);
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // restore file
+ $restoreResult = $view->rename($source, $target.$ext);
+
+ // handle the restore result
+ if( $restoreResult ) {
+ $view->touch($target.$ext, $mtime);
\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore',
array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
@@ -167,68 +275,183 @@ class Trashbin {
} else {
$trashbinSize -= $view->filesize($target.$ext);
}
- // if versioning app is enabled, copy versions from the trash bin back to the original location
- if ( \OCP\App::isEnabled('files_versions') ) {
- if ($timestamp ) {
- $versionedFile = $filename;
- } else {
- $versionedFile = $file;
- }
- if ( $result[0]['type'] === 'dir' ) {
- $trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.'files_trashbin/versions/'. $file));
- $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC\Files\Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext));
- } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) {
- foreach ($versions as $v) {
- if ($timestamp ) {
- $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('files_trashbin/versions/'.$versionedFile.'.v'.$v);
- $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
- }
- }
- }
- }
-
- // 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\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename);
- } else {
- $keyfile = \OC\Files\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\Files\View('/'.$user.'/'.$keyfile));
- $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename);
- } else {
- $trashbinSize -= $view->filesize($keyfile);
- $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key');
- }
- }
-
+
+ $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
+ $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
+
if ( $timestamp ) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
$query->execute(array($user,$filename,$timestamp));
}
self::setTrashbinSize($user, $trashbinSize);
-
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return true;
- } else {
- \OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR);
}
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return false;
}
+ /**
+ * @brief restore versions from trash bin
+ *
+ * @param \OC\Files\View $view file view
+ * @param $file complete path to file
+ * @param $filename name of file
+ * @param $ext file extension in case a file with the same $filename already exists
+ * @param $location location if file
+ * @param $timestamp deleteion time
+ *
+ * @return size of restored versions
+ */
+ private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_versions')) {
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $user = \OCP\User::getUser();
+ if ($timestamp) {
+ $versionedFile = $filename;
+ } else {
+ $versionedFile = $file;
+ }
+
+ if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
+ $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext));
+ } else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
+ foreach ($versions as $v) {
+ if ($timestamp) {
+ $size += $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 {
+ $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
+ $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v);
+ }
+ }
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ return $size;
+ }
+
+
+ /**
+ * @brief restore encryption keys from trash bin
+ *
+ * @param \OC\Files\View $view
+ * @param $file complete path to file
+ * @param $filename name of file
+ * @param $ext file extension in case a file with the same $filename already exists
+ * @param $location location if file
+ * @param $timestamp deleteion time
+ *
+ * @return size of restored encrypted file
+ */
+ private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
+ // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
+ $size = 0;
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $user = \OCP\User::getUser();
+
+ $path_parts = pathinfo($file);
+ $source_location = $path_parts['dirname'];
+
+ if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
+ if($source_location != '.') {
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename);
+ } else {
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
+ }
+ } else {
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
+ }
+
+ if ($timestamp) {
+ $keyfile .= '.d' . $timestamp;
+ }
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ if ($view->file_exists($keyfile)) {
+ // handle directory
+ if ($view->is_dir($keyfile)) {
+
+ // handle keyfiles
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+ $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext);
+
+ // handle share-keys
+ if ($timestamp) {
+ $sharekey .= '.d' . $timestamp;
+ }
+ $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext);
+
+ } else {
+ // handle keyfiles
+ $size += $view->filesize($keyfile);
+ $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext . '.key');
+
+ // handle share-keys
+ $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
+ if ($timestamp) {
+ $ownerShareKey .= '.d' . $timestamp;
+ }
+
+ $size += $view->filesize($ownerShareKey);
+
+ // move only owners key
+ $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext . '.' . $user. '.shareKey');
+
+ // try to re-share if file is shared
+ $filesystemView = new \OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($filesystemView);
+ $util = new \OCA\Encryption\Util($filesystemView, $user);
+
+ // fix the file size
+ $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $user . '/files/'. $location. '/' .$filename);
+ $util->fixFileSize($absolutePath);
+
+ // get current sharing state
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // get the final filename
+ $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename);
+
+ // get users sharing this file
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user);
+
+ // Attempt to set shareKey
+ $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext);
+ }
+ }
+
+ // enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+ return $size;
+ }
+
/**
- * delete file from trash bin permanently
+ * @brief delete file from trash bin permanently
+ *
* @param $filename path to the file
* @param $timestamp of deletion time
+ *
* @return size of deleted files
*/
public static function delete($filename, $timestamp=null) {
--
GitLab
From 06a5cf70f723b95e46beb2f1b167ec9a6db9b079 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 1 May 2013 02:01:16 +0200
Subject: [PATCH 122/304] fix duplicate login behavior if user not setup
---
apps/files_encryption/hooks/hooks.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 25c2d091c4..67d289ad68 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -52,7 +52,9 @@ class Hooks {
\OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
- return $util->setupServerSide( $params['password'] );
+ if(!$util->setupServerSide( $params['password'] )) {
+ return false;
+ }
}
--
GitLab
From d3db4ee103903e97ec2cfb8430b14699f1f6e8ae Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 1 May 2013 11:04:40 +0200
Subject: [PATCH 123/304] fixed re-share problems
---
apps/files_encryption/hooks/hooks.php | 8 ++++----
apps/files_encryption/lib/util.php | 15 +++++++++++----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 67d289ad68..c0e493752a 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -200,13 +200,13 @@ class Hooks {
$util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
- //check if this is a reshare action, that's true if the item source is already shared with me
- $sharedItem = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);
+ //check if this is a reshare action, that's true if the item source is already shared with me
+ $sharedItem = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['fileSource']);
if ($sharedItem) {
// if it is a re-share than the file is located in my Shared folder
$path = '/Shared'.$sharedItem['file_target'];
} else {
- $path = $util->fileIdToPath($params['itemSource']);
+ $path = $util->fileIdToPath($params['fileSource']);
}
$sharingEnabled = \OCP\Share::isEnabled();
@@ -224,7 +224,7 @@ class Hooks {
$failed = array();
// Attempt to set shareKey
- if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {
+ if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {
$failed[] = $path;
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4097250b25..eabb34f7ab 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -983,14 +983,21 @@ class Util {
*/
public function getAllFiles($dir) {
$result = array();
-
- $content = $this->view->getDirectoryContent($this->userFilesDir.$dir);
+
+ $content = $this->view->getDirectoryContent($this->userFilesDir.$dir);
+
+ // handling for re shared folders
+ $path_split = explode( '/', $dir );
+ $shared = '';
+ if($path_split[1] === 'Shared') {
+ $shared = '/Shared';
+ }
foreach ($content as $c) {
if ($c['type'] === "dir" ) {
- $result = array_merge($result, $this->getAllFiles(substr($c['path'],5)));
+ $result = array_merge($result, $this->getAllFiles($shared.substr($c['path'],5)));
} else {
- $result[] = substr($c['path'], 5);
+ $result[] = $shared.substr($c['path'], 5);
}
}
return $result;
--
GitLab
From ba29147e34a22142c4bfd2afa3f5b9f1e6efcd63 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 1 May 2013 19:18:31 +0200
Subject: [PATCH 124/304] Fixed recoveryadmin settings in user and admin
settings pages (js, templates, ajax) Renamed recovery methods in Util{} for
clarity Added note about bug causing slow page load and redundant keypair
generation recoveryAdmin functionality not yet complete
---
apps/files_encryption/ajax/adminrecovery.php | 27 +++++--
apps/files_encryption/ajax/userrecovery.php | 9 +--
apps/files_encryption/appinfo/app.php | 4 +-
.../js/{settings.js => settings-admin.js} | 13 +--
apps/files_encryption/js/settings-personal.js | 23 ++++++
apps/files_encryption/lib/keymanager.php | 2 +-
apps/files_encryption/lib/session.php | 18 +++--
apps/files_encryption/lib/util.php | 79 ++++++++++++-------
.../{settings.php => settings-admin.php} | 11 +--
apps/files_encryption/settings-personal.php | 20 +++++
.../{settings.php => settings-admin.php} | 0
.../templates/settings-personal.php | 22 ++++++
apps/files_encryption/tests/util.php | 14 ++--
13 files changed, 176 insertions(+), 66 deletions(-)
rename apps/files_encryption/js/{settings.js => settings-admin.js} (57%)
create mode 100644 apps/files_encryption/js/settings-personal.js
rename apps/files_encryption/{settings.php => settings-admin.php} (64%)
rename apps/files_encryption/templates/{settings.php => settings-admin.php} (100%)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index cec0cd4ddd..157fc8f313 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -17,11 +17,12 @@ use OCA\Encryption;
$return = $doSetup = false;
+// Enable recoveryAdmin
if (
isset( $_POST['adminEnableRecovery'] )
- && $_POST['adminEnableRecovery'] == 1
- && isset( $_POST['recoveryPassword'] )
- && ! empty ( $_POST['recoveryPassword'] )
+ && 1 == $_POST['adminEnableRecovery']
+// && isset( $_POST['recoveryPassword'] )
+// && ! empty ( $_POST['recoveryPassword'] )
) {
// TODO: Let the admin set this themselves
@@ -29,7 +30,7 @@ if (
// If desired recoveryAdmin UID is already in use
if ( ! \OC_User::userExists( $recoveryAdminUid ) ) {
-
+
// Create new recoveryAdmin user
\OC_User::createUser( $recoveryAdminUid, $_POST['recoveryPassword'] );
@@ -55,11 +56,11 @@ if (
}
- // If recoveryAdmin has passed other checks
+ // Setup recoveryAdmin user for encryption
if ( $doSetup ) {
$view = new \OC_FilesystemView( '/' );
- $util = new Util( $view, $recoveryAdminUid );
+ $util = new \OCA\Encryption\Util( $view, $recoveryAdminUid );
// Ensure recoveryAdmin is ready for encryption (has usable keypair etc.)
$util->setupServerSide( $_POST['recoveryPassword'] );
@@ -71,6 +72,20 @@ if (
}
+ // Set recoveryAdmin as enabled
+ OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
+
+// Disable recoveryAdmin
+} elseif (
+ isset( $_POST['adminEnableRecovery'] )
+ && 0 == $_POST['adminEnableRecovery']
+) {
+
+ // Set recoveryAdmin as enabled
+ OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 0 );
+
+ $return = true;
+
}
($return) ? OC_JSON::success() : OC_JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index 56c18f7ad5..f72be3181e 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -13,21 +13,18 @@ use OCA\Encryption;
\OCP\JSON::checkLoggedIn();
\OCP\JSON::checkAppEnabled( 'files_encryption' );
-\OCP\JSON::callCheck();
if (
isset( $_POST['userEnableRecovery'] )
+ && ( 0 == $_POST['userEnableRecovery'] || 1 == $_POST['userEnableRecovery'] )
) {
- // Ensure preference is an integer
- $recoveryEnabled = intval( $_POST['userEnableRecovery'] );
-
$userId = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' );
- $util = new Util( $view, $userId );
+ $util = new \OCA\Encryption\Util( $view, $userId );
// Save recovery preference to DB
- $result = $util->setRecovery( $recoveryEnabled );
+ $result = $util->setRecoveryForUser( $_POST['userEnableRecovery'] );
if ( $result ) {
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 9ae6c8331f..a7253c4333 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -28,7 +28,7 @@ OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'p
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$view = new OC_FilesystemView( '/' );
+$view = new \OC\Files\View( '/' );
$session = new OCA\Encryption\Session( $view );
@@ -50,5 +50,5 @@ if (
}
// Register settings scripts
-OCP\App::registerAdmin( 'files_encryption', 'settings' );
+OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings-admin.js
similarity index 57%
rename from apps/files_encryption/js/settings.js
rename to apps/files_encryption/js/settings-admin.js
index 9a0bebf247..48b5598d52 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -1,5 +1,6 @@
/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>, Robin Appelman
+ * <icewind1991@gmail.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
@@ -17,11 +18,11 @@ $(document).ready(function(){
$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
- var foo = $( this ).val();
+ var recoveryStatus = $( this ).val();
$.post(
- OC.filePath('files_encryption', 'ajax', 'adminrecovery.php')
- , { adminEnableRecovery: foo, recoveryPassword: 'password' }
+ OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
+ , { adminEnableRecovery: recoveryStatus, recoveryPassword: 'password' }
, function( data ) {
alert( data );
}
@@ -30,7 +31,7 @@ $(document).ready(function(){
);
function blackListChange(){
- var blackList=$('#encryption_blacklist').val().join(',');
- OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
+ var blackList=$( '#encryption_blacklist' ).val().join( ',' );
+ OC.AppConfig.setValue( 'files_encryption', 'type_blacklist', blackList );
}
})
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
new file mode 100644
index 0000000000..e4a1b7448f
--- /dev/null
+++ b/apps/files_encryption/js/settings-personal.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+$(document).ready(function(){
+ // Trigger ajax on recoveryAdmin status change
+ $( 'input:radio[name="userEnableRecovery"]' ).change(
+ function() {
+
+ var recoveryStatus = $( this ).val();
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'userrecovery.php' )
+ , { userEnableRecovery: recoveryStatus }
+ , function( data ) {
+ alert( data );
+ }
+ );
+ }
+ );
+})
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9f3cb8120c..51d4f8ffc0 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -32,7 +32,7 @@ class Keymanager {
/**
* @brief retrieve the ENCRYPTED private key from a user
*
- * @return string private key or false
+ * @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 0c6a7131fd..0e6bb96605 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -35,22 +35,28 @@ class Session {
*
* The ownCloud key pair is used to allow public link sharing even if encryption is enabled
*/
- public function __construct( \OC_FilesystemView $view ) {
+ public function __construct( $view ) {
$this->view = $view;
if ( ! $this->view->is_dir( 'owncloud_private_key' ) ) {
- $this->view->mkdir('owncloud_private_key');
+ $this->view->mkdir( 'owncloud_private_key' );
+
}
-
if (
- ! $this->view->file_exists("/public-keys/owncloud.public.key")
- || ! $this->view->file_exists("/owncloud_private_key/owncloud.private.key" )
+ ! $this->view->file_exists( "/public-keys/owncloud.public.key" )
+ || ! $this->view->file_exists( "/owncloud_private_key/owncloud.private.key" )
) {
-
+
+ //FIXME: Bug: for some reason file_exists is returning
+ // false in above if statement, and causing new keys
+ // to be generated on each page load. At last check
+ // our app.php is being executed 18 times per page load
+ // , causing 18 new keypairs and huge performance hit.
+
$keypair = Crypt::createKeypair();
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index eabb34f7ab..015125370b 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -24,11 +24,8 @@
# Bugs
# ----
# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# Timeouts on first login due to encryption of very large files (fix in progress, as a result streaming is currently broken)
# Sharing all files to admin for recovery purposes still in progress
# Possibly public links are broken (not tested since last merge of master)
-# encryptAll during login mangles paths: /files/files/
-# encryptAll is accessing files via encryption proxy - perhaps proxies should be disabled?
# Missing features
@@ -204,12 +201,18 @@ class Util {
$this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
-
- // create database configuration
- $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery`) VALUES (?,?,?)';
- $args = array( $this->userId, 'server-side', 0);
- $query = \OCP\DB::prepare( $sql );
- $query->execute( $args );
+
+ }
+
+ // If there's no record for this user's encryption preferences
+ if ( false === $this->recoveryEnabledForUser() ) {
+
+ // create database configuration
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery`) VALUES (?,?,?)';
+ $args = array( $this->userId, 'server-side', 0);
+ $query = \OCP\DB::prepare( $sql );
+ $query->execute( $args );
+
}
return true;
@@ -218,11 +221,11 @@ class Util {
/**
* @brief Check whether pwd recovery is enabled for a given user
- * @return bool
+ * @return 1 = yes, 0 = no, false = no record
* @note If records are not being returned, check for a hidden space
* at the start of the uid in db
*/
- public function recoveryEnabled() {
+ public function recoveryEnabledForUser() {
$sql = 'SELECT
recovery
@@ -237,16 +240,25 @@ class Util {
$result = $query->execute( $args );
- // Set default in case no records found
- $recoveryEnabled = 0;
+ $recoveryEnabled = array();
while( $row = $result->fetchRow() ) {
- $recoveryEnabled = $row['recovery'];
+ $recoveryEnabled[] = $row['recovery'];
}
- return $recoveryEnabled;
+ // If no record is found
+ if ( empty( $recoveryEnabled ) ) {
+
+ return false;
+
+ // If a record is found
+ } else {
+
+ return $recoveryEnabled[0];
+
+ }
}
@@ -255,20 +267,33 @@ class Util {
* @param bool $enabled Whether to enable or disable recovery
* @return bool
*/
- public function setRecovery( $enabled ) {
+ public function setRecoveryForUser( $enabled ) {
- $sql = 'UPDATE
- *PREFIX*encryption
- SET
- recovery = ?
- WHERE
- uid = ?';
+ $recoveryStatus = $this->recoveryEnabledForUser();
+
+ // If a record for this user already exists, update it
+ if ( false === $recoveryStatus ) {
- // Ensure value is an integer
- $enabled = intval( $enabled );
+ $sql = 'INSERT INTO `*PREFIX*encryption`
+ (`uid`,`mode`,`recovery`)
+ VALUES (?,?,?)';
+
+ $args = array( $this->userId, 'server-side', $enabled );
- $args = array( $enabled, $this->userId );
-
+ // Create a new record instead
+ } else {
+
+ $sql = 'UPDATE
+ *PREFIX*encryption
+ SET
+ recovery = ?
+ WHERE
+ uid = ?';
+
+ $args = array( $enabled, $this->userId );
+
+ }
+
$query = \OCP\DB::prepare( $sql );
if ( $query->execute( $args ) ) {
@@ -888,7 +913,7 @@ class Util {
public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
// Check if key recovery is enabled
- $recoveryEnabled = $this->recoveryEnabled();
+ $recoveryEnabled = $this->recoveryEnabledForUser();
// Make sure that a share key is generated for the owner too
list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings-admin.php
similarity index 64%
rename from apps/files_encryption/settings.php
rename to apps/files_encryption/settings-admin.php
index 71d47f061a..b09515f0c3 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings-admin.php
@@ -8,20 +8,21 @@
\OC_Util::checkAdminUser();
-$tmpl = new OCP\Template( 'files_encryption', 'settings' );
+$tmpl = new OCP\Template( 'files_encryption', 'settings-admin' );
$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
// Check if an adminRecovery account is enabled for recovering files after lost pwd
$view = new OC_FilesystemView( '' );
-$util = new \OCA\Encryption\Util( $view, \OCP\USER::getUser() );
-$recoveryEnabled = $util->recoveryEnabled();
+
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+$recoveryAdminUid = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminUid' );
$tmpl->assign( 'blacklist', $blackList );
$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
-$tmpl->assign( 'recoveryEnabled', $recoveryEnabled );
+$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
-\OCP\Util::addscript( 'files_encryption', 'settings' );
+\OCP\Util::addscript( 'files_encryption', 'settings-admin' );
\OCP\Util::addscript( 'core', 'multiselect' );
return $tmpl->fetchPage();
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index c001bb0d72..f7ebc42512 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -10,6 +10,26 @@ $tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
+// Add human readable message in case nothing is blacklisted
+if (
+ 1 == count( $blackList )
+ && $blackList[0] == ''
+) {
+
+ // FIXME: Make this string translatable
+ $blackList[0] = "(None - all filetypes will be encrypted)";
+
+}
+
+$user = \OCP\USER::getUser();
+$view = new \OC_FilesystemView( '/' );
+$util = new \OCA\Encryption\Util( $view, $user );
+
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+\OCP\Util::addscript( 'files_encryption', 'settings-personal' );
+
+$tmpl->assign( 'recoveryEnabled', $recoveryEnabledForUser );
$tmpl->assign( 'blacklist', $blackList );
return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings-admin.php
similarity index 100%
rename from apps/files_encryption/templates/settings.php
rename to apps/files_encryption/templates/settings-admin.php
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 5f0accaed5..0cefde36b6 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -3,6 +3,7 @@
<legend>
<?php p($l->t( 'Encryption' )); ?>
</legend>
+
<p>
<?php p($l->t( 'File encryption is enabled.' )); ?>
</p>
@@ -10,6 +11,7 @@
<p>
<?php p($l->t( 'The following file types will not be encrypted:' )); ?>
</p>
+
<ul>
<?php foreach( $_["blacklist"] as $type ): ?>
<li>
@@ -18,5 +20,25 @@
<?php endforeach; ?>
</ul>
<?php endif; ?>
+
+ <p>
+ <?php p($l->t( "Enable password recovery by sharing all files with administrator:" )); ?>
+ <br />
+ <input
+ type='radio'
+ name='userEnableRecovery'
+ value='1'
+ <?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : '' ); ?> />
+ <?php p($l->t( "Enabled" )); ?>
+ <br />
+
+ <input
+ type='radio'
+ name='userEnableRecovery'
+ value='0'
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : '' ); ?> />
+ <?php p($l->t( "Disabled" )); ?>
+ </p>
+
</fieldset>
</form>
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index e3ec0860fa..d0a988f96b 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -179,23 +179,23 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
}
- function testRecoveryEnabled() {
+ function testRecoveryEnabledForUser() {
$util = new Encryption\Util( $this->view, $this->userId );
// Record the value so we can return it to it's original state later
- $enabled = $util->recoveryEnabled();
+ $enabled = $util->recoveryEnabledForUser();
- $this->assertTrue( $util->setRecovery( 1 ) );
+ $this->assertTrue( $util->setRecoveryForUser( 1 ) );
- $this->assertEquals( 1, $util->recoveryEnabled() );
+ $this->assertEquals( 1, $util->recoveryEnabledForUser() );
- $this->assertTrue( $util->setRecovery( 0 ) );
+ $this->assertTrue( $util->setRecoveryForUser( 0 ) );
- $this->assertEquals( 0, $util->recoveryEnabled() );
+ $this->assertEquals( 0, $util->recoveryEnabledForUser() );
// Return the setting to it's previous state
- $this->assertTrue( $util->setRecovery( $enabled ) );
+ $this->assertTrue( $util->setRecoveryForUser( $enabled ) );
}
--
GitLab
From 996a557475f8ad0d5e8c75ca524817f1a7c4831e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 3 May 2013 13:00:04 +0200
Subject: [PATCH 125/304] get original path in case of shared files
---
apps/files_trashbin/lib/trash.php | 45 ++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 88c71a75ab..10e48a497d 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -29,6 +29,17 @@ class Trashbin {
// unit: percentage; 50% of available disk space/quota
const DEFAULTMAXSIZE=50;
+ public static function getUidAndFilename($filename) {
+ $uid = \OC\Files\Filesystem::getOwner($filename);
+ \OC\Files\Filesystem::initMountPoints($uid);
+ 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);
+ }
+
/**
* move file to the trash bin
*
@@ -143,35 +154,38 @@ class Trashbin {
if (\OCP\App::isEnabled('files_encryption')) {
$user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
// disable proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// retain key files
- $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path);
+ $keyfile = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/keyfiles/' . $ownerPath);
- if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) {
- $user = \OCP\User::getUser();
+ if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
// move keyfiles
- if ($view->is_dir($keyfile)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
- $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+ if ($rootView->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View($keyfile));
+ $rootView->rename($keyfile, $user.'/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
} else {
- $size += $view->filesize($keyfile . '.key');
- $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+ $size += $rootView->filesize($keyfile . '.key');
+ $rootView->rename($keyfile . '.key', $user.'/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
}
}
// retain share keys
- $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path);
+ $sharekeys = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/share-keys/' . $ownerPath);
- if ($view->is_dir($sharekeys)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
- $view->rename($sharekeys, 'files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+ if ($rootView->is_dir($sharekeys)) {
+ $size += self::calculateSize(new \OC\Files\View($sharekeys));
+ $rootView->rename($sharekeys, $user.'/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
} else {
// get local path to share-keys
- $localShareKeysPath = $view->getLocalFile($sharekeys);
+ $localShareKeysPath = $rootView->getLocalFile($sharekeys);
// handle share-keys
$matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
@@ -186,10 +200,10 @@ class Trashbin {
if($pathinfo['basename'] == $ownerShareKey) {
// calculate size
- $size += $view->filesize($sharekeys. '.' . $user. '.shareKey');
+ $size += $rootView->filesize($sharekeys. '.' . $user. '.shareKey');
// move file
- $view->rename($sharekeys. '.' . $user. '.shareKey', 'files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
+ $rootView->rename($sharekeys. '.' . $user. '.shareKey', $user.'/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
} else {
// calculate size
@@ -220,6 +234,7 @@ class Trashbin {
$user = \OCP\User::getUser();
$view = new \OC\Files\View('/'.$user);
+ $rootView = new \OC\Files\View('/');
$trashbinSize = self::getTrashbinSize($user);
if ( $trashbinSize === false || $trashbinSize < 0 ) {
--
GitLab
From a2516e549b3e59171448c6e9182f5b3c110dd076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 3 May 2013 14:03:42 +0200
Subject: [PATCH 126/304] get original path in case of shared files when
restoring file from trash bin
---
apps/files_trashbin/lib/trash.php | 41 +++++++++++++++++--------------
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 10e48a497d..221c32f553 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -234,7 +234,6 @@ class Trashbin {
$user = \OCP\User::getUser();
$view = new \OC\Files\View('/'.$user);
- $rootView = new \OC\Files\View('/');
$trashbinSize = self::getTrashbinSize($user);
if ( $trashbinSize === false || $trashbinSize < 0 ) {
@@ -368,7 +367,7 @@ class Trashbin {
* @param $file complete path to file
* @param $filename name of file
* @param $ext file extension in case a file with the same $filename already exists
- * @param $location location if file
+ * @param $location location of file
* @param $timestamp deleteion time
*
* @return size of restored encrypted file
@@ -378,20 +377,25 @@ class Trashbin {
$size = 0;
if (\OCP\App::isEnabled('files_encryption')) {
$user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ $target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+ list($owner, $ownerPath) = self::getUidAndFilename($target);
$path_parts = pathinfo($file);
$source_location = $path_parts['dirname'];
if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
if($source_location != '.') {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename);
- $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename);
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename);
} else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
- $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $filename);
+ $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $filename);
}
} else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
+ $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
}
if ($timestamp) {
@@ -402,35 +406,36 @@ class Trashbin {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if ($view->file_exists($keyfile)) {
+ if ($rootView->file_exists($keyfile)) {
// handle directory
- if ($view->is_dir($keyfile)) {
+ if ($rootView->is_dir($keyfile)) {
// handle keyfiles
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
- $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext);
+ $size += self::calculateSize(new \OC\Files\View($keyfile));
+ $rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath);
// handle share-keys
if ($timestamp) {
$sharekey .= '.d' . $timestamp;
}
- $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext);
+ $size += self::calculateSize(new \OC\Files\View($sharekey));
+ $rootView->rename($sharekey, $owner.'/files_encryption/share-keys/' . $ownerPath);
} else {
// handle keyfiles
- $size += $view->filesize($keyfile);
- $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext . '.key');
+ $size += $rootView->filesize($keyfile);
+ $rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath . '.key');
// handle share-keys
- $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
+ $ownerShareKey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
if ($timestamp) {
$ownerShareKey .= '.d' . $timestamp;
}
- $size += $view->filesize($ownerShareKey);
+ $size += $rootView->filesize($ownerShareKey);
// move only owners key
- $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext . '.' . $user. '.shareKey');
+ $rootView->rename($ownerShareKey, $owner.'/files_encryption/share-keys/' . $ownerPath . '.' . $user. '.shareKey');
// try to re-share if file is shared
$filesystemView = new \OC_FilesystemView('/');
@@ -438,7 +443,7 @@ class Trashbin {
$util = new \OCA\Encryption\Util($filesystemView, $user);
// fix the file size
- $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $user . '/files/'. $location. '/' .$filename);
+ $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/'. $ownerPath);
$util->fixFileSize($absolutePath);
// get current sharing state
--
GitLab
From 8a1223181bb330442aa3d641c4d081b1dd4888c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 3 May 2013 15:18:05 +0200
Subject: [PATCH 127/304] disable proxys before copying files to the trash bin
---
apps/files_trashbin/lib/trash.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 221c32f553..661d5f7bba 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -73,8 +73,12 @@ class Trashbin {
if ( $trashbinSize === false || $trashbinSize < 0 ) {
$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
}
-
+
+ // disable proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+ \OC_FileProxy::$enabled = $proxyStatus;
if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
$trashbinSize += $sizeOfAddedFiles;
--
GitLab
From 050258f003a5b2314890b2cc81963b68df2d987c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 3 May 2013 16:33:18 +0200
Subject: [PATCH 128/304] remove encryption keys if a file gets deleted
permanently
---
apps/files_trashbin/lib/trash.php | 72 ++++++++++++++++++++-----------
1 file changed, 46 insertions(+), 26 deletions(-)
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 661d5f7bba..3e8a6f7885 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -496,7 +496,25 @@ class Trashbin {
$file = $filename;
}
+ $size += self::deleteVersions($view, $file, $filename, $timestamp);
+ $size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp);
+
+ if ($view->is_dir('/files_trashbin/files/'.$file)) {
+ $size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
+ } else {
+ $size += $view->filesize('/files_trashbin/files/'.$file);
+ }
+ $view->unlink('/files_trashbin/files/'.$file);
+ $trashbinSize -= $size;
+ self::setTrashbinSize($user, $trashbinSize);
+
+ return $size;
+ }
+
+ private static function deleteVersions($view, $file, $filename, $timestamp) {
+ $size = 0;
if ( \OCP\App::isEnabled('files_versions') ) {
+ $user = \OCP\User::getUser();
if ($view->is_dir('files_trashbin/versions/'.$file)) {
$size += self::calculateSize(new \OC\Files\view('/'.$user.'/files_trashbin/versions/'.$file));
$view->unlink('files_trashbin/versions/'.$file);
@@ -512,35 +530,37 @@ class Trashbin {
}
}
}
-
- // Take care of encryption keys
- $parts = pathinfo($file);
- if ( $view->is_dir('/files_trashbin/files/'.$file) ) {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename);
- } else {
- $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key');
- }
- if ($timestamp) {
- $keyfile .= '.d'.$timestamp;
- }
- if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
- if ( $view->is_dir($keyfile) ) {
- $size += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
+ return $size;
+ }
+
+ private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) {
+ $size = 0;
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $user = \OCP\User::getUser();
+
+ if ($view->is_dir('/files_trashbin/files/' . $file)) {
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
} else {
- $size += $view->filesize($keyfile);
+ $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
+ $sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
+ }
+ if ($timestamp) {
+ $keyfile .= '.d' . $timestamp;
+ $sharekeys .= '.d' . $timestamp;
+ }
+ if ($view->file_exists($keyfile)) {
+ if ($view->is_dir($keyfile)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+ $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
+ } else {
+ $size += $view->filesize($keyfile);
+ $size += $view->filesize($sharekeys);
+ }
+ $view->unlink($keyfile);
+ $view->unlink($sharekeys);
}
- $view->unlink($keyfile);
- }
-
- if ($view->is_dir('/files_trashbin/files/'.$file)) {
- $size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
- } else {
- $size += $view->filesize('/files_trashbin/files/'.$file);
}
- $view->unlink('/files_trashbin/files/'.$file);
- $trashbinSize -= $size;
- self::setTrashbinSize($user, $trashbinSize);
-
return $size;
}
--
GitLab
From d649f77898b04a0215f16cfee7f26a40e5c1f8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 3 May 2013 17:14:43 +0200
Subject: [PATCH 129/304] make sure to find the correct path for shared files
---
apps/files_trashbin/lib/trash.php | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 3e8a6f7885..d61ac433d0 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -125,13 +125,17 @@ class Trashbin {
\OC_FileProxy::$enabled = false;
$user = \OCP\User::getUser();
- if ($view->is_dir('files_versions/' . $file_path)) {
- $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path));
- $view->rename('files_versions/' . $file_path, 'files_trashbin/versions/' . $filename . '.d' . $timestamp);
- } else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) {
+ $rootView = new \OC\Files\View('/');
+
+ list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
+ if ($rootView->is_dir($owner.'/files_versions/' . $ownerPath)) {
+ $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
+ $rootView->rename($owner.'/files_versions/' . $ownerPath, $user.'/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+ } else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
foreach ($versions as $v) {
- $size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']);
- $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+ $size += $rootView->filesize($owner.'/files_versions' . $v['path'] . '.v' . $v['version']);
+ $rootView->rename($owner.'/files_versions' . $v['path'] . '.v' . $v['version'], $user.'/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
}
}
@@ -336,6 +340,12 @@ class Trashbin {
\OC_FileProxy::$enabled = false;
$user = \OCP\User::getUser();
+ $rootView = new \OC\Files\View('/');
+
+ $target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+ list($owner, $ownerPath) = self::getUidAndFilename($target);
+
if ($timestamp) {
$versionedFile = $filename;
} else {
@@ -344,15 +354,15 @@ class Trashbin {
if ($view->is_dir('/files_trashbin/versions/'.$file)) {
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
- $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext));
+ $rootView->rename(\OC\Files\Filesystem::normalizePath($user.'/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner.'/files_versions/' . $ownerPath));
} else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
foreach ($versions as $v) {
if ($timestamp) {
$size += $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);
+ $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
} else {
$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
- $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v);
+ $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
}
}
}
--
GitLab
From 9605d14a17522dd47c760a1c37a0374cfb0551b9 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 4 May 2013 03:37:22 +0200
Subject: [PATCH 130/304] fixed re-share problems
---
apps/files_encryption/hooks/hooks.php | 64 ++++++++++++++++++++++-----
apps/files_encryption/lib/util.php | 19 ++++++++
2 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c0e493752a..c21b9d69f6 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -200,16 +200,57 @@ class Hooks {
$util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
- //check if this is a reshare action, that's true if the item source is already shared with me
- $sharedItem = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['fileSource']);
- if ($sharedItem) {
- // if it is a re-share than the file is located in my Shared folder
- $path = '/Shared'.$sharedItem['file_target'];
- } else {
- $path = $util->fileIdToPath($params['fileSource']);
- }
+ //if parent is set, then this is a re-share action
+ if($params['parent']) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent($params['parent']);
+
+ // if parent is file the it is an 1:1 share
+ if($parent['item_type'] === 'file') {
+
+ // prefix path with Shared
+ $path = '/Shared'.$parent['file_target'];
+
+ } else {
+ // parent is folder but shared was a file!
+ // we try to rebuild the missing path
+ // some examples we face here
+ // user1 share folder1 with user2 folder1 has the following structure /folder1/subfolder1/subsubfolder1/somefile.txt
+ // user2 re-share subfolder2 with user3
+ // user3 re-share somefile.txt user4
+ // so our path should be /Shared/subfolder1/subsubfolder1/somefile.txt while user3 is sharing
+ if($params['itemType'] === 'file') {
+ // get target path
+ $targetPath = $util->fileIdToPath($params['fileSource']);
+ $targetPathSplit = array_reverse(explode('/', $targetPath));
+
+ // init values
+ $path = '';
+ $sharedPart = ltrim( $parent['file_target'], '/' );
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+ if($pathPart !== $sharedPart) {
+ $path = '/'.$pathPart.$path;
+ } else {
+ break;
+ }
+ }
+
+ // prefix path with Shared
+ $path = '/Shared'.$parent['file_target'].$path;
+
+ } else {
+
+ // prefix path with Shared
+ $path = '/Shared'.$parent['file_target'];
+ }
+ }
+
+ }
- $sharingEnabled = \OCP\Share::isEnabled();
+ $sharingEnabled = \OCP\Share::isEnabled();
// if a folder was shared, get a list if all (sub-)folders
if ($params['itemType'] === 'folder') {
@@ -274,13 +315,14 @@ class Hooks {
$allFiles = array($path);
}
-
+
foreach ( $allFiles as $path ) {
// check if the user still has access to the file, otherwise delete share key
$sharingUsers = $util->getSharingUsersArray(true, $path);
- // Unshare every user who no longer has access to the file
+ // Unshare every user who no longer has access to the file
+ //TODO: does not work properly atm
$delUsers = array_diff($userIds, $sharingUsers);
if ( ! Keymanager::delShareKey( $view, $delUsers, $path ) ) {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 015125370b..f442a89f6f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1028,4 +1028,23 @@ class Util {
return $result;
}
+ /**
+ * @brief get shares parent.
+ * @param int $Id of the current share
+ * @return array of the parent
+ */
+ public static function getShareParent($Id) {
+
+ $query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
+ .' FROM `*PREFIX*share`'
+ .' WHERE `id` = ?' );
+
+ $result = $query->execute( array( $Id ) );
+
+ $row = $result->fetchRow();
+
+ return $row;
+
+ }
+
}
--
GitLab
From c8946ea6086c642a5c367f2e5f63d58bc185c331 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Sat, 4 May 2013 16:14:38 +0200
Subject: [PATCH 131/304] Added support for user-specified password for
adminRecovery account in admin settings page Made encryptAll() (file
migration for unencrypted + legacy encrypted files) run only on first login
for each user (status stored in DB) Made recoveryAdmin user member of 'admin'
user group automatically Set recoveryadmin settings to only display on user
settings if enabled by an admin Updated encryption db xml schema
---
apps/files_encryption/ajax/adminrecovery.php | 3 +
apps/files_encryption/appinfo/database.xml | 7 ++
apps/files_encryption/hooks/hooks.php | 73 +++++++-----
apps/files_encryption/js/settings-admin.js | 24 ++--
apps/files_encryption/lib/session.php | 34 +++---
apps/files_encryption/lib/util.php | 109 +++++++++++++++---
apps/files_encryption/settings-admin.php | 1 +
apps/files_encryption/settings-personal.php | 4 +-
.../templates/settings-admin.php | 11 +-
.../templates/settings-personal.php | 38 +++---
10 files changed, 215 insertions(+), 89 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 157fc8f313..eeeaf4c6ed 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -34,6 +34,9 @@ if (
// Create new recoveryAdmin user
\OC_User::createUser( $recoveryAdminUid, $_POST['recoveryPassword'] );
+ // Make recovery user an administrator
+ \OC_Group::addToGroup ( $recoveryAdminUid, 'admin' );
+
$doSetup = true;
} else {
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index b144b6cb2a..64c9ef65fa 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -27,6 +27,13 @@
<default>0</default>
<comments>Whether encryption key recovery is enabled</comments>
</field>
+ <field>
+ <name>migrationStatus</name>
+ <type>boolean</type>
+ <notnull>true</notnull>
+ <default>0</default>
+ <comments>Whether encryption migration has been performed</comments>
+ </field>
</declaration>
</table>
</database>
\ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c21b9d69f6..0633a81a05 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -69,43 +69,52 @@ class Hooks {
$session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
-
- //FIXME: disabled because it gets called each time a user do an operation on iPhone
- //FIXME: we need a better place doing this and maybe only one time or by user
- /*$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
-
- // Set legacy encryption key if it exists, to support
- // depreciated encryption system
- if (
- $view1->file_exists( 'encryption.key' )
- && $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
- ) {
-
- $plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
-
- $session->setLegacyKey( $plainLegacyKey );
-
- }
- \OC_FileProxy::$enabled = false;
-
- $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
+ // Check if first-run file migration has already been performed
+ $migrationCompleted = $util->getMigrationStatus();
- \OC_FileProxy::$enabled = false;*/
+ // If migration not yet done
+ if ( ! $migrationCompleted ) {
- // Encrypt existing user files:
- // This serves to upgrade old versions of the encryption
- // app (see appinfo/spec.txt)
- /*if (
- $util->encryptAll( $publicKey, '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
- ) {
+ $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+
+ // Set legacy encryption key if it exists, to support
+ // depreciated encryption system
+ if (
+ $view1->file_exists( 'encryption.key' )
+ && $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
+ ) {
- \OC_Log::write(
- 'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" started at login'
- , \OC_Log::INFO
- );
+ $plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
+
+ $session->setLegacyKey( $plainLegacyKey );
+
+ }
+
+ \OC_FileProxy::$enabled = false;
+
+ $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
+
+ \OC_FileProxy::$enabled = false;
+
+ // Encrypt existing user files:
+ // This serves to upgrade old versions of the encryption
+ // app (see appinfo/spec.txt)
+ if (
+ $util->encryptAll( $publicKey, '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
+ ) {
+
+ \OC_Log::write(
+ 'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" completed'
+ , \OC_Log::INFO
+ );
+
+ }
+
+ // Register successful migration in DB
+ $util->setMigrationStatus( 1 );
- }*/
+ }
return true;
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 48b5598d52..8e9c8c2230 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -19,14 +19,24 @@ $(document).ready(function(){
function() {
var recoveryStatus = $( this ).val();
+ var recoveryPassword = $( '#recoveryPassword' ).val();
- $.post(
- OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
- , { adminEnableRecovery: recoveryStatus, recoveryPassword: 'password' }
- , function( data ) {
- alert( data );
- }
- );
+ if ( '' == recoveryPassword ) {
+
+ // FIXME: add proper OC notification
+ alert( 'You must set a recovery account password first' );
+
+ } else {
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
+ , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
+ , function( data ) {
+ alert( data );
+ }
+ );
+
+ }
}
);
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 0e6bb96605..22453131db 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -57,23 +57,23 @@ class Session {
// our app.php is being executed 18 times per page load
// , causing 18 new keypairs and huge performance hit.
- $keypair = Crypt::createKeypair();
-
- \OC_FileProxy::$enabled = false;
-
- // Save public key
-
- if (!$view->is_dir('/public-keys')) {
- $view->mkdir('/public-keys');
- }
-
- $this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
-
- // Encrypt private key empthy passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
-
- // Save private key
- $this->view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey );
+// $keypair = Crypt::createKeypair();
+//
+// \OC_FileProxy::$enabled = false;
+//
+// // Save public key
+//
+// if (!$view->is_dir('/public-keys')) {
+// $view->mkdir('/public-keys');
+// }
+//
+// $this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
+//
+// // Encrypt private key empthy passphrase
+// $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
+//
+// // Save private key
+// $this->view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f442a89f6f..91502af4a3 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -859,8 +859,6 @@ class Util {
// Make sure users are capable of sharing
$filteredUids = $this->filterShareReadyUsers( $users );
-// trigger_error( print_r($filteredUids, 1) );
-
if ( ! empty( $filteredUids['unready'] ) ) {
// Notify user of unready userDir
@@ -913,10 +911,21 @@ class Util {
public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
// Check if key recovery is enabled
- $recoveryEnabled = $this->recoveryEnabledForUser();
+ if (
+ \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' )
+ && $this->recoveryEnabledForUser()
+ ) {
+
+ $recoveryEnabled = true;
+
+ } else {
+
+ $recoveryEnabled = false;
+
+ }
// Make sure that a share key is generated for the owner too
- list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+ list( $owner, $ownerPath ) = $this->getUidAndFilename( $filePath );
if ( $sharingEnabled ) {
@@ -928,18 +937,21 @@ class Util {
// If recovery is enabled, add the
// Admin UID to list of users to share to
if ( $recoveryEnabled ) {
-
- // FIXME: Create a separate admin user purely for recovery, and create method in util for fetching this id from DB?
- $adminUid = 'recoveryAdmin';
-
- $userIds[] = $adminUid;
+
+ // Find recoveryAdmin user ID
+ $recoveryAdminUid = \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminUid' );
+
+ // Add recoveryAdmin to list of users sharing
+ $userIds[] = $recoveryAdminUid;
}
- // add current user if given
- if($currentUserId != false) {
- $userIds[] = $currentUserId;
- }
+ // add current user if given
+ if ( $currentUserId != false ) {
+
+ $userIds[] = $currentUserId;
+
+ }
// Remove duplicate UIDs
$uniqueUserIds = array_unique ( $userIds );
@@ -947,6 +959,77 @@ class Util {
return $uniqueUserIds;
}
+
+ /**
+ * @brief Set file migration status for user
+ */
+ public function setMigrationStatus( $status ) {
+
+ $sql = 'UPDATE
+ *PREFIX*encryption
+ SET
+ migrationStatus = ?
+ WHERE
+ uid = ?';
+
+ $args = array( $status, $this->userId );
+
+ $query = \OCP\DB::prepare( $sql );
+
+ if ( $query->execute( $args ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Check whether pwd recovery is enabled for a given user
+ * @return 1 = yes, 0 = no, false = no record
+ * @note If records are not being returned, check for a hidden space
+ * at the start of the uid in db
+ */
+ public function getMigrationStatus() {
+
+ $sql = 'SELECT
+ migrationStatus
+ FROM
+ `*PREFIX*encryption`
+ WHERE
+ uid = ?';
+
+ $args = array( $this->userId );
+
+ $query = \OCP\DB::prepare( $sql );
+
+ $result = $query->execute( $args );
+
+ $migrationStatus = array();
+
+ while( $row = $result->fetchRow() ) {
+
+ $migrationStatus[] = $row['migrationStatus'];
+
+ }
+
+ // If no record is found
+ if ( empty( $migrationStatus ) ) {
+
+ return false;
+
+ // If a record is found
+ } else {
+
+ return $migrationStatus[0];
+
+ }
+
+ }
/**
* @brief get uid of the owners of the file and the path to the file
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
index b09515f0c3..ae9a85643e 100644
--- a/apps/files_encryption/settings-admin.php
+++ b/apps/files_encryption/settings-admin.php
@@ -21,6 +21,7 @@ $recoveryAdminUid = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminUi
$tmpl->assign( 'blacklist', $blackList );
$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
+$tmpl->assign( 'recoveryAdminUid', $recoveryAdminUid );
\OCP\Util::addscript( 'files_encryption', 'settings-admin' );
\OCP\Util::addscript( 'core', 'multiselect' );
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index f7ebc42512..c6d9d80f0b 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -25,11 +25,13 @@ $user = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' );
$util = new \OCA\Encryption\Util( $view, $user );
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
\OCP\Util::addscript( 'files_encryption', 'settings-personal' );
-$tmpl->assign( 'recoveryEnabled', $recoveryEnabledForUser );
+$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
+$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );
$tmpl->assign( 'blacklist', $blackList );
return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 6499d0c8e8..863f1dfa9a 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -18,8 +18,17 @@
</select>
</p>
<p>
- <?php p($l->t( "Enable encryption passwords recovery account (allow sharing to recovery account):" )); ?>
+ <strong>
+ <?php p($l->t( "Enable encryption passwords recovery account (allow sharing to recovery account):" )); ?>
<br />
+ </strong>
+ <?php p($l->t( "To perform a recovery log in using the 'recoveryAdmin' account and the specified password" )); ?>
+ <br />
+ <?php if ( empty( $_['recoveryAdminUid'] ) ): ?>
+ <input type="password" name="recoveryPassword" id="recoveryPassword" />
+ <label for="recoveryPassword">Recovery account password</label>
+ <br />
+ <?php endif; ?>
<input
type='radio'
name='adminEnableRecovery'
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 0cefde36b6..c81f361ced 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -21,24 +21,26 @@
</ul>
<?php endif; ?>
- <p>
- <?php p($l->t( "Enable password recovery by sharing all files with administrator:" )); ?>
- <br />
- <input
- type='radio'
- name='userEnableRecovery'
- value='1'
- <?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : '' ); ?> />
- <?php p($l->t( "Enabled" )); ?>
- <br />
-
- <input
- type='radio'
- name='userEnableRecovery'
- value='0'
- <?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : '' ); ?> />
- <?php p($l->t( "Disabled" )); ?>
- </p>
+ <?php if ( $_["recoveryEnabled"] ): ?>
+ <p>
+ <?php p($l->t( "Enable password recovery by sharing all files with administrator:" )); ?>
+ <br />
+ <input
+ type='radio'
+ name='userEnableRecovery'
+ value='1'
+ <?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />
+ <?php p($l->t( "Enabled" )); ?>
+ <br />
+
+ <input
+ type='radio'
+ name='userEnableRecovery'
+ value='0'
+ <?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />
+ <?php p($l->t( "Disabled" )); ?>
+ </p>
+ <?php endif; ?>
</fieldset>
</form>
--
GitLab
From ee083c20e68ce3101c5dd1b69f94eabcc54c89d6 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 5 May 2013 23:41:04 +0200
Subject: [PATCH 132/304] improved pre_unshare and post_unshare hook
---
lib/public/share.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/public/share.php b/lib/public/share.php
index e0aedf3569..fee906d187 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -514,6 +514,7 @@ class Share {
'fileSource' => $item['file_source'],
'shareType' => $shareType,
'shareWith' => $shareWith,
+ 'itemParent' => $item['parent'],
));
self::delete($item['id']);
\OC_Hook::emit('OCP\Share', 'post_unshare', array(
@@ -521,6 +522,7 @@ class Share {
'itemSource' => $itemSource,
'shareType' => $shareType,
'shareWith' => $shareWith,
+ 'itemParent' => $item['parent'],
));
return true;
}
--
GitLab
From 5610429a02352df36e2e64f25e0a8af474915268 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 5 May 2013 23:41:42 +0200
Subject: [PATCH 133/304] handling for re-share and re-unshare should work now
---
apps/files_encryption/hooks/hooks.php | 132 +++++++++++++++-----------
apps/files_encryption/lib/util.php | 48 +++++++++-
2 files changed, 120 insertions(+), 60 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 0633a81a05..a72d339277 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -23,10 +23,11 @@
namespace OCA\Encryption;
+use OC\Files\Filesystem;
+
/**
* Class for hook specific logic
*/
-
class Hooks {
// TODO: use passphrase for encrypting private key that is separate to
@@ -253,10 +254,9 @@ class Hooks {
} else {
// prefix path with Shared
- $path = '/Shared'.$parent['file_target'];
+ $path = '/Shared'.$parent['file_target'].$params['fileTarget'];
}
}
-
}
$sharingEnabled = \OCP\Share::isEnabled();
@@ -282,10 +282,8 @@ class Hooks {
// If no attempts to set keyfiles failed
if (empty($failed)) {
-
return true;
} else {
-
return false;
}
}
@@ -294,73 +292,91 @@ class Hooks {
/**
* @brief
*/
- public static function postUnshare( $params ) {
-
- // NOTE: $params has keys:
- // [itemType] => file
- // [itemSource] => 13
- // [shareType] => 0
- // [shareWith] => test1
-
- if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
-
- $view = new \OC_FilesystemView( '/' );
- $session = new Session($view);
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
- $path = $util->fileIdToPath( $params['itemSource'] );
+ public static function postUnshare($params)
+ {
- // for group shares get a list of the group members
- if ($params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP) {
- $userIds = \OC_Group::usersInGroup($params['shareWith']);
- } else {
- $userIds = array($params['shareWith']);
- }
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // [itemSource] => 13
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [itemParent] =>
- // if we unshare a folder we need a list of all (sub-)files
- if ($params['itemType'] === 'folder') {
- $allFiles = $util->getAllFiles($path);
- } else {
- $allFiles = array($path);
- }
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $view = new \OC_FilesystemView('/');
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $path = $util->fileIdToPath($params['itemSource']);
+ // check if this is a re-share
+ if ($params['itemParent']) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent($params['itemParent']);
- foreach ( $allFiles as $path ) {
+ // get target path
+ $targetPath = $util->fileIdToPath($params['itemSource']);
+ $targetPathSplit = array_reverse(explode('/', $targetPath));
- // check if the user still has access to the file, otherwise delete share key
- $sharingUsers = $util->getSharingUsersArray(true, $path);
+ // init values
+ $path = '';
+ $sharedPart = ltrim($parent['file_target'], '/');
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+ if ($pathPart !== $sharedPart) {
+ $path = '/' . $pathPart . $path;
+ } else {
+ break;
+ }
+ }
+
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $path;
+ }
+
+ // for group shares get a list of the group members
+ if ($params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP) {
+ $userIds = \OC_Group::usersInGroup($params['shareWith']);
+ } else {
+ $userIds = array($params['shareWith']);
+ }
+
+ // if we unshare a folder we need a list of all (sub-)files
+ if ($params['itemType'] === 'folder') {
+ $allFiles = $util->getAllFiles($path);
+ } else {
+ $allFiles = array($path);
+ }
+
+ foreach ($allFiles as $path) {
+
+ // check if the user still has access to the file, otherwise delete share key
+ $sharingUsers = $util->getSharingUsersArray(true, $path);
// Unshare every user who no longer has access to the file
- //TODO: does not work properly atm
- $delUsers = array_diff($userIds, $sharingUsers);
- if ( ! Keymanager::delShareKey( $view, $delUsers, $path ) ) {
-
- $failed[] = $path;
-
- }
-
- }
-
- // If no attempts to set keyfiles failed
- if ( empty( $failed ) ) {
-
- return true;
-
- } else {
-
- return false;
-
- }
+ $delUsers = array_diff($userIds, $sharingUsers);
+ if (!Keymanager::delShareKey($view, $delUsers, $path)) {
+ $failed[] = $path;
+ }
- }
+ }
- }
+ // If no attempts to set keyfiles failed
+ if (empty($failed)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
/**
* @brief
*/
public static function postUnshareAll( $params ) {
-
+
// NOTE: It appears that this is never called for files, so
// we may not need to implement it
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 91502af4a3..2e8e2af683 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1102,10 +1102,26 @@ class Util {
}
foreach ($content as $c) {
+ $sharedPart = $path_split[sizeof($path_split)-1];
+ $targetPathSplit = array_reverse(explode('/', $c['path']));
+
+ $path = '';
+
+ // rebuild path
+ foreach ($targetPathSplit as $pathPart) {
+ if($pathPart !== $sharedPart) {
+ $path = '/'.$pathPart.$path;
+ } else {
+ break;
+ }
+ }
+
+ $path = $dir.$path;
+
if ($c['type'] === "dir" ) {
- $result = array_merge($result, $this->getAllFiles($shared.substr($c['path'],5)));
+ $result = array_merge($result, $this->getAllFiles($path));
} else {
- $result[] = $shared.substr($c['path'], 5);
+ $result[] = $path;
}
}
return $result;
@@ -1130,4 +1146,32 @@ class Util {
}
+ /**
+ * @brief get owner of the shared files.
+ * @param int $Id of a share
+ * @return owner
+ */
+ public function getOwnerFromSharedFile($id) {
+ $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+ $source = $query->execute(array($id))->fetchRow();
+
+ if (isset($source['parent'])) {
+ $parent = $source['parent'];
+ while (isset($parent)) {
+ $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+ $item = $query->execute(array($parent))->fetchRow();
+ if (isset($item['parent'])) {
+ $parent = $item['parent'];
+ } else {
+ $fileOwner = $item['uid_owner'];
+ break;
+ }
+ }
+ } else {
+ $fileOwner = $source['uid_owner'];
+ }
+
+ return $fileOwner;
+ }
+
}
--
GitLab
From d3df80a078c5c6f4cface5eb53b980fd13e272ae Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 6 May 2013 21:14:59 +0200
Subject: [PATCH 134/304] merge my fix from master
b4649701423c2e75373a5ecf7640c6e2b781a970
---
lib/files/cache/cache.php | 2 +-
lib/files/cache/scanner.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 4e32ff2ba8..d0c871bead 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -441,7 +441,7 @@ class Cache {
$this->calculateFolderSize($path);
if ($path !== '') {
$parent = dirname($path);
- if ($parent === '.') {
+ if ($parent === '.' or $parent === '/') {
$parent = '';
}
$this->correctFolderSize($parent);
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index f019d4fc60..5241acec1e 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -68,7 +68,7 @@ class Scanner {
if ($data) {
if ($file) {
$parent = dirname($file);
- if ($parent === '.') {
+ if ($parent === '.' or $parent === '/') {
$parent = '';
}
if (!$this->cache->inCache($parent)) {
--
GitLab
From fe6d12ddec46e5d68486d5db22a8508a2ab2b2ea Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 6 May 2013 21:15:25 +0200
Subject: [PATCH 135/304] fix file info put on stream
---
apps/files_encryption/lib/stream.php | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index a51f2c56d9..eb1cb45871 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -512,7 +512,19 @@ class Stream {
// Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
- \OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => 1, 'size' => $this->size, 'unencrypted_size' => $this->unencryptedSize ), '' );
+ // get file info
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($this->rawPath);
+ if(!is_array($fileInfo)) {
+ $fileInfo = array();
+ }
+
+ // set encryption data
+ $fileInfo['encrypted'] = 1;
+ $fileInfo['size'] = $this->size;
+ $fileInfo['unencrypted_size'] = $this->unencryptedSize;
+
+ // set fileinfo
+ \OC\Files\Filesystem::putFileInfo( $this->rawPath, $fileInfo);
}
return fclose( $this->handle );
--
GitLab
From 8fcef411438cc8e07fe1eaebafd9ea23c9812745 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 6 May 2013 21:16:42 +0200
Subject: [PATCH 136/304] added test for share
---
apps/files_encryption/tests/share.php | 115 ++++++++++++++++++++++++++
1 file changed, 115 insertions(+)
create mode 100755 apps/files_encryption/tests/share.php
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
new file mode 100755
index 0000000000..362231afaa
--- /dev/null
+++ b/apps/files_encryption/tests/share.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
+ * Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+use OCA\Encryption;
+
+// This has to go here because otherwise session errors arise, and the private
+// encryption key needs to be saved in the session
+
+/**
+ * @note It would be better to use Mockery here for mocking out the session
+ * handling process, and isolate calls to session class and data from the unit
+ * tests relating to them (stream etc.). However getting mockery to work and
+ * overload classes whilst also using the OC autoloader is difficult due to
+ * load order Pear errors.
+ */
+
+class Test_Share extends \PHPUnit_Framework_TestCase {
+
+ function setUp() {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ $this->dataShort = 'hats';
+ $this->view = new \OC_FilesystemView( '/' );
+
+ $userHome = \OC_User::getHome('admin');
+ $this->dataDir = str_replace('/admin', '', $userHome);
+
+ OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+ }
+
+ function tearDown() {
+
+ }
+
+ function testShareFile() {
+ // create user1
+ $this->loginHelper('user1', true);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ $filename = 'tmp-'.time().'.test';
+
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file infos
+ $fileInfo = $this->view->getFileInfo('/admin/files/'.$filename);
+
+ // check if we have fileInfos
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if we have fileInfos
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_READ);
+
+ $this->loginHelper('admin', false);
+
+ // check if share key exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+ }
+
+ function loginHelper($user, $create=false) {
+ if($create) {
+ \OC_User::createUser($user, $user);
+ }
+
+ \OC_User::setUserId($user);
+
+ \OC\Files\Filesystem::mount( '\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), '/'.$user.'/files/Shared/' );
+ \OC\Files\Filesystem::mount( '\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), 'Shared/' );
+
+ \OC\Files\Filesystem::init($user, '/'.$user.'/files');
+
+ $params['uid'] = $user;
+ $params['password'] = $user;
+ OCA\Encryption\Hooks::login($params);
+ }
+}
--
GitLab
From a9649713d31f9524355680515ed9fe080eba6d63 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 13:42:08 +0200
Subject: [PATCH 137/304] fix empty path
---
apps/files_encryption/lib/proxy.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 50f30594b4..820b7d8b67 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -433,6 +433,11 @@ class Proxy extends \OC_FileProxy {
$path_split = explode('/', $path);
$path_f = implode('/', array_slice($path_split, 3));
+ // if path is empty we cannot resolve anything
+ if(empty($path_f)) {
+ return $size;
+ }
+
// get file info from database/cache
$fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
--
GitLab
From 8b545538722179ea7e68c4765fa9722adc77d546 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 13:42:49 +0200
Subject: [PATCH 138/304] fix for wrong file infos
---
apps/files_encryption/lib/stream.php | 4 ++--
apps/files_encryption/lib/util.php | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index eb1cb45871..c2b13b00b2 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -513,7 +513,7 @@ class Stream {
\OC_FileProxy::$enabled = $proxyStatus;
// get file info
- $fileInfo = \OC\Files\Filesystem::getFileInfo($this->rawPath);
+ $fileInfo = $view->getFileInfo($this->rawPath);
if(!is_array($fileInfo)) {
$fileInfo = array();
}
@@ -524,7 +524,7 @@ class Stream {
$fileInfo['unencrypted_size'] = $this->unencryptedSize;
// set fileinfo
- \OC\Files\Filesystem::putFileInfo( $this->rawPath, $fileInfo);
+ $view->putFileInfo( $this->rawPath, $fileInfo);
}
return fclose( $this->handle );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2e8e2af683..5ab5ea6425 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1040,7 +1040,8 @@ class Util {
*/
public function getUidAndFilename( $path ) {
- $fileOwnerUid = \OC\Files\Filesystem::getOwner( $path );
+ $view = new \OC\Files\View($this->userFilesDir);
+ $fileOwnerUid = $view->getOwner( $path );
// Check that UID is valid
if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
@@ -1060,7 +1061,7 @@ class Util {
} else {
- $info = \OC\Files\Filesystem::getFileInfo( $path );
+ $info = $view->getFileInfo( $path );
$ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
// Fetch real file path from DB
@@ -1069,7 +1070,7 @@ class Util {
}
// Make path relative for use by $view
- $relpath = $fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename;
+ $relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename);
// Check that the filename we're using is working
if ( $this->view->file_exists( $relpath ) ) {
--
GitLab
From b535964006706fc2df1b3e8fb733a62a3351c585 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 13:43:34 +0200
Subject: [PATCH 139/304] test for share is now able to run with autotest.sh
---
apps/files_encryption/tests/share.php | 30 ++++++++++++++++++---------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 362231afaa..b6f5ce2c6b 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -30,10 +30,11 @@ use OCA\Encryption;
* load order Pear errors.
*/
-class Test_Share extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
function setUp() {
// reset backend
+ \OC_User::clearBackends();
\OC_User::useBackend('database');
$this->dataShort = 'hats';
@@ -43,7 +44,18 @@ class Test_Share extends \PHPUnit_Framework_TestCase {
$this->dataDir = str_replace('/admin', '', $userHome);
OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
- }
+
+ // Sharing-related hooks
+ OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
+ OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
+ OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
+
+ OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
+ OC_FileProxy::register( new OCA\Encryption\Proxy() );
+
+ OC::registerShareHooks();
+ }
function tearDown() {
@@ -56,7 +68,7 @@ class Test_Share extends \PHPUnit_Framework_TestCase {
// login as admin
$this->loginHelper('admin');
- $filename = 'tmp-'.time().'.test';
+ $filename = 'share-tmp-'.time().'.test';
$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
@@ -81,7 +93,7 @@ class Test_Share extends \PHPUnit_Framework_TestCase {
// share the file
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_READ);
- $this->loginHelper('admin', false);
+ $this->loginHelper('admin');
// check if share key exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
@@ -89,8 +101,9 @@ class Test_Share extends \PHPUnit_Framework_TestCase {
// login as user1
$this->loginHelper('user1');
+ $view = new \OC\Files\View('/user1/files/');
// Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $filename);
+ $retreivedCryptedFile = $view->file_get_contents('Shared/' . $filename);
// check if data is the same
$this->assertEquals($this->dataShort, $retreivedCryptedFile);
@@ -101,13 +114,10 @@ class Test_Share extends \PHPUnit_Framework_TestCase {
\OC_User::createUser($user, $user);
}
+ \OC_User::setUserId('');
+ \OC_Util::setupFS($user);
\OC_User::setUserId($user);
- \OC\Files\Filesystem::mount( '\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), '/'.$user.'/files/Shared/' );
- \OC\Files\Filesystem::mount( '\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), 'Shared/' );
-
- \OC\Files\Filesystem::init($user, '/'.$user.'/files');
-
$params['uid'] = $user;
$params['password'] = $user;
OCA\Encryption\Hooks::login($params);
--
GitLab
From 4b53f72d0d749cceec7a9fa7be5d8bc6bab722c6 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 7 May 2013 16:17:38 +0200
Subject: [PATCH 140/304] Added facility to manually encrypt all files from
personal settings Added success/fail feedback to personal settings functions
Improved look/layout of personal settings page Fixed misplaced plain text in
ajax scripts
---
apps/files_encryption/ajax/adminrecovery.php | 5 +--
apps/files_encryption/ajax/encryptall.php | 40 +++++++++++++++++++
apps/files_encryption/ajax/userrecovery.php | 22 +++++-----
.../css/settings-personal.css | 10 +++++
apps/files_encryption/js/settings-personal.js | 39 +++++++++++++++++-
apps/files_encryption/settings-personal.php | 3 ++
.../templates/settings-personal.php | 32 +++++++++++----
7 files changed, 127 insertions(+), 24 deletions(-)
create mode 100644 apps/files_encryption/ajax/encryptall.php
create mode 100644 apps/files_encryption/css/settings-personal.css
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index eeeaf4c6ed..c3c19943c0 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -1,5 +1,3 @@
-setValue( $app, $key, $value )
-
<?php
/**
* Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
@@ -91,4 +89,5 @@ if (
}
-($return) ? OC_JSON::success() : OC_JSON::error();
\ No newline at end of file
+// Return success or failure
+( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/encryptall.php b/apps/files_encryption/ajax/encryptall.php
new file mode 100644
index 0000000000..ce613ca443
--- /dev/null
+++ b/apps/files_encryption/ajax/encryptall.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle manual trigger of \OCA\Encryption\Util{}->encryptAll()
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::callCheck();
+
+$return = false;
+
+if (
+ isset( $_POST['encryptAll'] )
+ && ! empty( $_POST['userPassword'] )
+) {
+
+ $view = new \OC_FilesystemView( '' );
+ $userId = \OCP\User::getUser();
+ $util = new \OCA\Encryption\Util( $view, $userId );
+ $session = new \OCA\Encryption\Session( $view );
+ $publicKey = \OCA\Encryption\Keymanager::getPublicKey( $view, $userId );
+ $path = '/' . $userId . '/' . 'files';
+
+ $util->encryptAll( $publicKey, $path, $session->getLegacyKey(), $_POST['userPassword'] );
+
+ $return = true;
+
+} else {
+
+ $return = false;
+
+}
+
+// Return success or failure
+( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index f72be3181e..85a799011d 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -1,5 +1,3 @@
-setValue( $app, $key, $value )
-
<?php
/**
* Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
@@ -13,6 +11,7 @@ use OCA\Encryption;
\OCP\JSON::checkLoggedIn();
\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::callCheck();
if (
isset( $_POST['userEnableRecovery'] )
@@ -24,16 +23,13 @@ if (
$util = new \OCA\Encryption\Util( $view, $userId );
// Save recovery preference to DB
- $result = $util->setRecoveryForUser( $_POST['userEnableRecovery'] );
-
- if ( $result ) {
-
- \OCP\JSON::success();
-
- } else {
+ $return = $util->setRecoveryForUser( $_POST['userEnableRecovery'] );
- \OCP\JSON::error();
-
- }
+} else {
+
+ $return = false;
-}
\ No newline at end of file
+}
+
+// Return success or failure
+( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/css/settings-personal.css b/apps/files_encryption/css/settings-personal.css
new file mode 100644
index 0000000000..4ee0acc976
--- /dev/null
+++ b/apps/files_encryption/css/settings-personal.css
@@ -0,0 +1,10 @@
+/* Copyright (c) 2013, Sam Tuke, <samtuke@owncloud.com>
+ This file is licensed under the Affero General Public License version 3 or later.
+ See the COPYING-README file. */
+
+#encryptAllError
+, #encryptAllSuccess
+, #recoveryEnabledError
+, #recoveryEnabledSuccess {
+ display: none;
+}
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
index e4a1b7448f..3b9b00dc79 100644
--- a/apps/files_encryption/js/settings-personal.js
+++ b/apps/files_encryption/js/settings-personal.js
@@ -9,15 +9,52 @@ $(document).ready(function(){
$( 'input:radio[name="userEnableRecovery"]' ).change(
function() {
+ // Hide feedback messages in case they're already visible
+ $('#recoveryEnabledSuccess').hide();
+ $('#recoveryEnabledError').hide();
+
var recoveryStatus = $( this ).val();
$.post(
OC.filePath( 'files_encryption', 'ajax', 'userrecovery.php' )
, { userEnableRecovery: recoveryStatus }
, function( data ) {
- alert( data );
+ if ( data.status == "success" ) {
+ $('#recoveryEnabledSuccess').show();
+ } else {
+ $('#recoveryEnabledError').show();
+ }
+ }
+ );
+ // Ensure page is not reloaded on form submit
+ return false;
+ }
+ );
+
+ $("#encryptAll").click(
+ function(){
+
+ // Hide feedback messages in case they're already visible
+ $('#encryptAllSuccess').hide();
+ $('#encryptAllError').hide();
+
+ var userPassword = $( '#userPassword' ).val();
+ var encryptAll = $( '#encryptAll' ).val();
+
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'encryptall.php' )
+ , { encryptAll: encryptAll, userPassword: userPassword }
+ , function( data ) {
+ if ( data.status == "success" ) {
+ $('#encryptAllSuccess').show();
+ } else {
+ $('#encryptAllError').show();
+ }
}
);
+ // Ensure page is not reloaded on form submit
+ return false;
}
+
);
})
\ No newline at end of file
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index c6d9d80f0b..46efb61b02 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -6,6 +6,9 @@
* See the COPYING-README file.
*/
+// Add CSS stylesheet
+\OC_Util::addStyle( 'files_encryption', 'settings-personal' );
+
$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index c81f361ced..00f567ecb2 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,15 +1,17 @@
<form id="encryption">
<fieldset class="personalblock">
<legend>
- <?php p($l->t( 'Encryption' )); ?>
+ <?php p( $l->t( 'Encryption' ) ); ?>
</legend>
<p>
- <?php p($l->t( 'File encryption is enabled.' )); ?>
+<!-- <?php p( $l->t( 'File encryption is enabled.' ) ); ?> -->
</p>
<?php if ( ! empty( $_["blacklist"] ) ): ?>
<p>
- <?php p($l->t( 'The following file types will not be encrypted:' )); ?>
+ <strong>File types</strong>
+ <br />
+ <?php p( $l->t( 'The following file types will not be encrypted:' ) ); ?>
</p>
<ul>
@@ -20,17 +22,19 @@
<?php endforeach; ?>
</ul>
<?php endif; ?>
-
+ <br />
<?php if ( $_["recoveryEnabled"] ): ?>
<p>
- <?php p($l->t( "Enable password recovery by sharing all files with administrator:" )); ?>
+ <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with administrator:" ) ); ?></label>
+ <br />
+ <em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" ) ); ?></em>
<br />
<input
type='radio'
name='userEnableRecovery'
value='1'
<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />
- <?php p($l->t( "Enabled" )); ?>
+ <?php p( $l->t( "Enabled" ) ); ?>
<br />
<input
@@ -38,9 +42,23 @@
name='userEnableRecovery'
value='0'
<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />
- <?php p($l->t( "Disabled" )); ?>
+ <?php p( $l->t( "Disabled" ) ); ?>
+ <div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>
+ <div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>
</p>
<?php endif; ?>
+ <br />
+ <p>
+ <label for="encryptAll"><?php p( $l->t( "Scan for unencrypted files and encrypt them" ) ); ?></label>
+ <br />
+ <em><?php p( $l->t( "Use this if you suspect that you still have files which are unencrypted, or encrypted using ownCloud 4 or older." ) ); ?></em>
+ <br />
+ <input type="submit" id="encryptAll" name="encryptAll" value="<?php p( $l->t( 'Scan and encrypt files' ) ); ?>" />
+ <input type="password" name="userPassword" id="userPassword" />
+ <label for="encryptAll"><?php p( $l->t( "Account password" ) ); ?></label>
+ <div id="encryptAllSuccess"><?php p( $l->t( 'Scan complete' ) );?></div>
+ <div id="encryptAllError"><?php p( $l->t( 'Unable to scan and encrypt files' ) );?></div>
+ </p>
</fieldset>
</form>
--
GitLab
From b8a421a86db09c7ed106c2f9aee15aa337761e4a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 7 May 2013 16:34:09 +0200
Subject: [PATCH 141/304] New hook system
---
lib/hooks/basicemitter.php | 89 ++++++++++
lib/hooks/emitter.php | 32 ++++
lib/hooks/legacyemitter.php | 16 ++
tests/lib/hooks/basicemitter.php | 261 ++++++++++++++++++++++++++++++
tests/lib/hooks/legacyemitter.php | 55 +++++++
5 files changed, 453 insertions(+)
create mode 100644 lib/hooks/basicemitter.php
create mode 100644 lib/hooks/emitter.php
create mode 100644 lib/hooks/legacyemitter.php
create mode 100644 tests/lib/hooks/basicemitter.php
create mode 100644 tests/lib/hooks/legacyemitter.php
diff --git a/lib/hooks/basicemitter.php b/lib/hooks/basicemitter.php
new file mode 100644
index 0000000000..bd24539a40
--- /dev/null
+++ b/lib/hooks/basicemitter.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+abstract class BasicEmitter implements Emitter {
+
+ /**
+ * @var (callable[])[] $listeners
+ */
+ private $listeners = array();
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback) {
+ $eventName = $scope . '::' . $method;
+ if (!isset($this->listeners[$eventName])) {
+ $this->listeners[$eventName] = array();
+ }
+ if (array_search($callback, $this->listeners[$eventName]) === false) {
+ $this->listeners[$eventName][] = $callback;
+ }
+ }
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function remoteListener($scope = null, $method = null, $callback = null) {
+ $names = array();
+ $allNames = array_keys($this->listeners);
+ if ($scope and $method) {
+ $name = $scope . '::' . $method;
+ if (isset($this->listeners[$name])) {
+ $names[] = $name;
+ }
+ } elseif ($scope) {
+ foreach ($allNames as $name) {
+ $parts = explode('::', $name, 2);
+ if ($parts[0] == $scope) {
+ $names[] = $name;
+ }
+ }
+ } elseif ($method) {
+ foreach ($allNames as $name) {
+ $parts = explode('::', $name, 2);
+ if ($parts[1] == $method) {
+ $names[] = $name;
+ }
+ }
+ } else {
+ $names = $allNames;
+ }
+
+ foreach ($names as $name) {
+ if ($callback) {
+ $index = array_search($callback, $this->listeners[$name]);
+ if ($index !== false) {
+ unset($this->listeners[$name][$index]);
+ }
+ } else {
+ $this->listeners[$name] = array();
+ }
+ }
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param array $arguments optional
+ */
+ protected function emit($scope, $method, $arguments = array()) {
+ $eventName = $scope . '::' . $method;
+ if (isset($this->listeners[$eventName])) {
+ foreach ($this->listeners[$eventName] as $callback) {
+ call_user_func_array($callback, $arguments);
+ }
+ }
+ }
+}
diff --git a/lib/hooks/emitter.php b/lib/hooks/emitter.php
new file mode 100644
index 0000000000..4219b6f354
--- /dev/null
+++ b/lib/hooks/emitter.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+/**
+ * Class Emitter
+ *
+ * interface for all classes that are able to emit events
+ *
+ * @package OC\Hooks
+ */
+interface Emitter {
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback);
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function remoteListener($scope = null, $method = null, $callback = null);
+}
diff --git a/lib/hooks/legacyemitter.php b/lib/hooks/legacyemitter.php
new file mode 100644
index 0000000000..a2d16ace9a
--- /dev/null
+++ b/lib/hooks/legacyemitter.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+abstract class LegacyEmitter extends BasicEmitter {
+ protected function emit($scope, $method, $arguments = array()) {
+ \OC_Hook::emit($scope, $method, $arguments);
+ parent::emit($scope, $method, $arguments);
+ }
+}
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
new file mode 100644
index 0000000000..53de996c5c
--- /dev/null
+++ b/tests/lib/hooks/basicemitter.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+
+/**
+ * Class DummyEmitter
+ *
+ * class to make BasicEmitter::emit publicly available
+ *
+ * @package Test\Hooks
+ */
+class DummyEmitter extends \OC\Hooks\BasicEmitter {
+ public function emitEvent($scope, $method, $arguments = array()) {
+ $this->emit($scope, $method, $arguments);
+ }
+}
+
+/**
+ * Class EmittedException
+ *
+ * a dummy exception so we can check if an event is emitted
+ *
+ * @package Test\Hooks
+ */
+class EmittedException extends \Exception {
+}
+
+class BasicEmitter extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var \OC\Hooks\Emitter $emitter
+ */
+ protected $emitter;
+
+ public function setUp() {
+ $this->emitter = new DummyEmitter();
+ }
+
+ public function nonStaticCallBack() {
+ throw new EmittedException;
+ }
+
+ public static function staticCallBack() {
+ throw new EmittedException;
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testAnonymousFunction() {
+ $this->emitter->listen('Test', 'test', function () {
+ throw new EmittedException;
+ });
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testStaticCallback() {
+ $this->emitter->listen('Test', 'test', array('\Test\Hooks\BasicEmitter', 'staticCallBack'));
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testNonStaticCallback() {
+ $this->emitter->listen('Test', 'test', array($this, 'nonStaticCallBack'));
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ public function testOnlyCallOnce() {
+ $count = 0;
+ $listener = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->assertEquals(1, $count, 'Listener called an invalid number of times (' . $count . ') expected 1');
+ }
+
+ public function testDifferentMethods() {
+ $count = 0;
+ $listener = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Test', 'foo');
+ $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+ }
+
+ public function testDifferentScopes() {
+ $count = 0;
+ $listener = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Bar', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Bar', 'test');
+ $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+ }
+
+ public function testDifferentCallbacks() {
+ $count = 0;
+ $listener1 = function () use (&$count) {
+ $count++;
+ };
+ $listener2 = function () use (&$count) {
+ $count++;
+ };
+ $this->emitter->listen('Test', 'test', $listener1);
+ $this->emitter->listen('Test', 'test', $listener2);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testArguments() {
+ $this->emitter->listen('Test', 'test', function ($foo, $bar) {
+ if ($foo == 'foo' and $bar == 'bar') {
+ throw new EmittedException;
+ }
+ });
+ $this->emitter->emitEvent('Test', 'test', array('foo', 'bar'));
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testNamedArguments() {
+ $this->emitter->listen('Test', 'test', function ($foo, $bar) {
+ if ($foo == 'foo' and $bar == 'bar') {
+ throw new EmittedException;
+ }
+ });
+ $this->emitter->emitEvent('Test', 'test', array('foo' => 'foo', 'bar' => 'bar'));
+ }
+
+ public function testRemoveAllSpecified() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->remoteListener('Test', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ public function testRemoveWildcardListener() {
+ $listener1 = function () {
+ throw new EmittedException;
+ };
+ $listener2 = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener1);
+ $this->emitter->listen('Test', 'test', $listener2);
+ $this->emitter->remoteListener('Test', 'test');
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ public function testRemoveWildcardMethod() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->remoteListener('Test', null, $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Test', 'foo');
+ }
+
+ public function testRemoveWildcardScope() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Bar', 'test', $listener);
+ $this->emitter->remoteListener(null, 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Bar', 'test');
+ }
+
+ public function testRemoveWildcardScopeAndMethod() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->listen('Bar', 'foo', $listener);
+ $this->emitter->remoteListener(null, null, $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ $this->emitter->emitEvent('Test', 'foo');
+ $this->emitter->emitEvent('Bar', 'foo');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveKeepOtherCallback() {
+ $listener1 = function () {
+ throw new EmittedException;
+ };
+ $listener2 = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener1);
+ $this->emitter->listen('Test', 'test', $listener2);
+ $this->emitter->remoteListener('Test', 'test', $listener1);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveKeepOtherMethod() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Test', 'foo', $listener);
+ $this->emitter->remoteListener('Test', 'foo', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveKeepOtherScope() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->listen('Bar', 'test', $listener);
+ $this->emitter->remoteListener('Bar', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+
+ /**
+ * @expectedException \Test\Hooks\EmittedException
+ */
+ public function testRemoveNonExistingName() {
+ $listener = function () {
+ throw new EmittedException;
+ };
+ $this->emitter->listen('Test', 'test', $listener);
+ $this->emitter->remoteListener('Bar', 'test', $listener);
+ $this->emitter->emitEvent('Test', 'test');
+ }
+}
diff --git a/tests/lib/hooks/legacyemitter.php b/tests/lib/hooks/legacyemitter.php
new file mode 100644
index 0000000000..a7bed879a7
--- /dev/null
+++ b/tests/lib/hooks/legacyemitter.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+
+/**
+ * Class DummyLegacyEmitter
+ *
+ * class to make LegacyEmitter::emit publicly available
+ *
+ * @package Test\Hooks
+ */
+class DummyLegacyEmitter extends \OC\Hooks\LegacyEmitter {
+ public function emitEvent($scope, $method, $arguments = array()) {
+ $this->emit($scope, $method, $arguments);
+ }
+}
+
+class LegacyEmitter extends BasicEmitter {
+
+ //we can't use exceptions here since OC_Hooks catches all exceptions
+ private static $emitted = false;
+
+ public function setUp() {
+ $this->emitter = new DummyLegacyEmitter();
+ self::$emitted = false;
+ \OC_Hook::clear('Test','test');
+ }
+
+ public static function staticLegacyCallBack() {
+ self::$emitted = true;
+ }
+
+ public static function staticLegacyArgumentsCallBack($arguments) {
+ if ($arguments['foo'] == 'foo' and $arguments['bar'] == 'bar')
+ self::$emitted = true;
+ }
+
+ public function testLegacyHook() {
+ \OC_Hook::connect('Test', 'test', '\Test\Hooks\LegacyEmitter', 'staticLegacyCallBack');
+ $this->emitter->emitEvent('Test', 'test');
+ $this->assertEquals(true, self::$emitted);
+ }
+
+ public function testLegacyArguments() {
+ \OC_Hook::connect('Test', 'test', '\Test\Hooks\LegacyEmitter', 'staticLegacyArgumentsCallBack');
+ $this->emitter->emitEvent('Test', 'test', array('foo' => 'foo', 'bar' => 'bar'));
+ $this->assertEquals(true, self::$emitted);
+ }
+}
--
GitLab
From 763c8f78ed8ab4178eeece3a1a4233c56e0da73e Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Tue, 7 May 2013 17:16:16 +0200
Subject: [PATCH 142/304] Made code formatting of new methods more consistent
---
apps/files_encryption/hooks/hooks.php | 303 +++++++++++++++-----------
1 file changed, 171 insertions(+), 132 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index a72d339277..ddec839acd 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -183,7 +183,7 @@ class Hooks {
/**
* @brief
*/
- public static function postShared($params) {
+ public static function postShared( $params ) {
// NOTE: $params has keys:
// [itemType] => file
@@ -202,89 +202,109 @@ class Hooks {
// [id] => 10
// [token] =>
// TODO: Should other kinds of item be encrypted too?
- if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC_FilesystemView( '/' );
$session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
- $path = $util->fileIdToPath($params['itemSource']);
-
- //if parent is set, then this is a re-share action
- if($params['parent']) {
-
- // get the parent from current share
- $parent = $util->getShareParent($params['parent']);
-
- // if parent is file the it is an 1:1 share
- if($parent['item_type'] === 'file') {
-
- // prefix path with Shared
- $path = '/Shared'.$parent['file_target'];
-
- } else {
- // parent is folder but shared was a file!
- // we try to rebuild the missing path
- // some examples we face here
- // user1 share folder1 with user2 folder1 has the following structure /folder1/subfolder1/subsubfolder1/somefile.txt
- // user2 re-share subfolder2 with user3
- // user3 re-share somefile.txt user4
- // so our path should be /Shared/subfolder1/subsubfolder1/somefile.txt while user3 is sharing
- if($params['itemType'] === 'file') {
- // get target path
- $targetPath = $util->fileIdToPath($params['fileSource']);
- $targetPathSplit = array_reverse(explode('/', $targetPath));
-
- // init values
- $path = '';
- $sharedPart = ltrim( $parent['file_target'], '/' );
-
- // rebuild path
- foreach ($targetPathSplit as $pathPart) {
- if($pathPart !== $sharedPart) {
- $path = '/'.$pathPart.$path;
- } else {
- break;
- }
- }
-
- // prefix path with Shared
- $path = '/Shared'.$parent['file_target'].$path;
-
- } else {
-
- // prefix path with Shared
- $path = '/Shared'.$parent['file_target'].$params['fileTarget'];
- }
- }
- }
+ $path = $util->fileIdToPath( $params['itemSource'] );
+
+ //if parent is set, then this is a re-share action
+ if( $params['parent'] ) {
+
+ // get the parent from current share
+ $parent = $util->getShareParent( $params['parent'] );
+
+ // if parent is file the it is an 1:1 share
+ if($parent['item_type'] === 'file') {
+
+ // prefix path with Shared
+ $path = '/Shared'.$parent['file_target'];
+
+ } else {
+
+ // NOTE: parent is folder but shared was a file!
+ // we try to rebuild the missing path
+ // some examples we face here
+ // user1 share folder1 with user2 folder1 has
+ // the following structure
+ // /folder1/subfolder1/subsubfolder1/somefile.txt
+ // user2 re-share subfolder2 with user3
+ // user3 re-share somefile.txt user4
+ // so our path should be
+ // /Shared/subfolder1/subsubfolder1/somefile.txt
+ // while user3 is sharing
+
+ if ( $params['itemType'] === 'file' ) {
+ // get target path
+ $targetPath = $util->fileIdToPath( $params['fileSource'] );
+ $targetPathSplit = array_reverse( explode( '/', $targetPath ) );
+
+ // init values
+ $path = '';
+ $sharedPart = ltrim( $parent['file_target'], '/' );
+
+ // rebuild path
+ foreach ( $targetPathSplit as $pathPart ) {
+
+ if( $pathPart !== $sharedPart ) {
+
+ $path = '/' . $pathPart . $path;
+
+ } else {
+
+ break;
+
+ }
+
+ }
+
+ // prefix path with Shared
+ $path = '/Shared'.$parent['file_target'].$path;
+
+ } else {
+
+ // prefix path with Shared
+ $path = '/Shared'.$parent['file_target'].$params['fileTarget'];
+ }
+ }
+ }
- $sharingEnabled = \OCP\Share::isEnabled();
+ $sharingEnabled = \OCP\Share::isEnabled();
// if a folder was shared, get a list if all (sub-)folders
- if ($params['itemType'] === 'folder') {
+ if ( $params['itemType'] === 'folder' ) {
$allFiles = $util->getAllFiles($path);
} else {
- $allFiles = array($path);
+
+ $allFiles = array( $path );
+
}
- foreach ($allFiles as $path) {
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
+ foreach ( $allFiles as $path ) {
+
+ $usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path );
$failed = array();
// Attempt to set shareKey
- if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {
+ if ( !$util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
$failed[] = $path;
}
}
// If no attempts to set keyfiles failed
- if (empty($failed)) {
+ if ( empty( $failed ) ) {
+
return true;
+
} else {
+
return false;
+
}
}
}
@@ -292,85 +312,104 @@ class Hooks {
/**
* @brief
*/
- public static function postUnshare($params)
- {
-
- // NOTE: $params has keys:
- // [itemType] => file
- // [itemSource] => 13
- // [shareType] => 0
- // [shareWith] => test1
- // [itemParent] =>
-
- if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-
- $view = new \OC_FilesystemView('/');
- $userId = \OCP\User::getUser();
- $util = new Util($view, $userId);
- $path = $util->fileIdToPath($params['itemSource']);
-
- // check if this is a re-share
- if ($params['itemParent']) {
-
- // get the parent from current share
- $parent = $util->getShareParent($params['itemParent']);
-
- // get target path
- $targetPath = $util->fileIdToPath($params['itemSource']);
- $targetPathSplit = array_reverse(explode('/', $targetPath));
-
- // init values
- $path = '';
- $sharedPart = ltrim($parent['file_target'], '/');
-
- // rebuild path
- foreach ($targetPathSplit as $pathPart) {
- if ($pathPart !== $sharedPart) {
- $path = '/' . $pathPart . $path;
- } else {
- break;
- }
- }
-
- // prefix path with Shared
- $path = '/Shared' . $parent['file_target'] . $path;
- }
+ public static function postUnshare( $params ) {
- // for group shares get a list of the group members
- if ($params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP) {
- $userIds = \OC_Group::usersInGroup($params['shareWith']);
- } else {
- $userIds = array($params['shareWith']);
- }
+ // NOTE: $params has keys:
+ // [itemType] => file
+ // [itemSource] => 13
+ // [shareType] => 0
+ // [shareWith] => test1
+ // [itemParent] =>
- // if we unshare a folder we need a list of all (sub-)files
- if ($params['itemType'] === 'folder') {
- $allFiles = $util->getAllFiles($path);
- } else {
- $allFiles = array($path);
- }
+ if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
- foreach ($allFiles as $path) {
+ $view = new \OC_FilesystemView( '/' );
+ $userId = \OCP\User::getUser();
+ $util = new Util( $view, $userId);
+ $path = $util->fileIdToPath( $params['itemSource'] );
- // check if the user still has access to the file, otherwise delete share key
- $sharingUsers = $util->getSharingUsersArray(true, $path);
+ // check if this is a re-share
+ if ( $params['itemParent'] ) {
- // Unshare every user who no longer has access to the file
- $delUsers = array_diff($userIds, $sharingUsers);
- if (!Keymanager::delShareKey($view, $delUsers, $path)) {
- $failed[] = $path;
- }
+ // get the parent from current share
+ $parent = $util->getShareParent( $params['itemParent'] );
- }
+ // get target path
+ $targetPath = $util->fileIdToPath( $params['itemSource'] );
+ $targetPathSplit = array_reverse( explode( '/', $targetPath ) );
- // If no attempts to set keyfiles failed
- if (empty($failed)) {
- return true;
- } else {
- return false;
- }
- }
- }
+ // init values
+ $path = '';
+ $sharedPart = ltrim( $parent['file_target'], '/' );
+
+ // rebuild path
+ foreach ( $targetPathSplit as $pathPart ) {
+
+ if ( $pathPart !== $sharedPart ) {
+
+ $path = '/' . $pathPart . $path;
+
+ } else {
+
+ break;
+
+ }
+
+ }
+
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'] . $path;
+ }
+
+ // for group shares get a list of the group members
+ if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP ) {
+
+ $userIds = \OC_Group::usersInGroup($params['shareWith']);
+
+ } else {
+
+ $userIds = array( $params['shareWith'] );
+
+ }
+
+ // if we unshare a folder we need a list of all (sub-)files
+ if ( $params['itemType'] === 'folder' ) {
+
+ $allFiles = $util->getAllFiles( $path );
+
+ } else {
+
+ $allFiles = array( $path );
+ }
+
+ foreach ( $allFiles as $path ) {
+
+ // check if the user still has access to the file, otherwise delete share key
+ $sharingUsers = $util->getSharingUsersArray( true, $path );
+
+ // Unshare every user who no longer has access to the file
+ $delUsers = array_diff( $userIds, $sharingUsers);
+
+ if ( !Keymanager::delShareKey( $view, $delUsers, $path ) ) {
+
+ $failed[] = $path;
+
+ }
+
+ }
+
+ // If no attempts to set keyfiles failed
+ if ( empty( $failed ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+ }
+ }
/**
* @brief
--
GitLab
From cdf4bec6a1f9b30ca9b8e5a121582689c91c351d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 22:19:48 +0200
Subject: [PATCH 143/304] fix for tearDownFS, after filesystem::tearDown() the
root is not mounted
---
lib/util.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/util.php b/lib/util.php
index 38453c1ce9..4fc1e8b232 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,6 +66,7 @@ class OC_Util {
public static function tearDownFS() {
\OC\Files\Filesystem::tearDown();
self::$fsSetup=false;
+ self::$rootMounted=false;
}
/**
--
GitLab
From 33fc830dd3c037fadd4be35d41937b43c418c188 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 22:22:05 +0200
Subject: [PATCH 144/304] added test for re-share
---
apps/files_encryption/tests/share.php | 75 ++++++++++++++++++++++++---
1 file changed, 69 insertions(+), 6 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index b6f5ce2c6b..11a3864540 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -43,8 +43,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
$userHome = \OC_User::getHome('admin');
$this->dataDir = str_replace('/admin', '', $userHome);
- OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+ OC_Hook::clear('OCP\\Share');
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
@@ -61,14 +62,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
}
- function testShareFile() {
+ function testShareFile($withTeardown = true) {
// create user1
$this->loginHelper('user1', true);
// login as admin
$this->loginHelper('admin');
- $filename = 'share-tmp-'.time().'.test';
+ $filename = 'share-tmp.test';
$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
@@ -91,7 +92,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::$enabled = $proxyStatus;
// share the file
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_READ);
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
$this->loginHelper('admin');
@@ -101,12 +102,73 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// login as user1
$this->loginHelper('user1');
- $view = new \OC\Files\View('/user1/files/');
// Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $view->file_get_contents('Shared/' . $filename);
+ $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $filename);
// check if data is the same
$this->assertEquals($this->dataShort, $retreivedCryptedFile);
+
+ if($withTeardown) {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // share the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
+
+ // tear down
+ \OC_User::deleteUser('user1');
+ }
+ }
+
+ function testReShareFile($withTeardown = true) {
+ $this->testShareFile(false);
+
+ // create user2
+ $this->loginHelper('user2', true);
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ $filename = 'share-tmp.test';
+
+ // get the file info
+ $fileInfo = $this->view->getFileInfo('/user1/files/Shared/'.$filename);
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+
+ $this->loginHelper('admin');
+
+ // check if share key exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user2.shareKey'));
+
+ // login as user2
+ $this->loginHelper('user2');
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+
+ if($withTeardown) {
+ // login as admin
+ $this->loginHelper('user1');
+
+ // share the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+
+ $this->loginHelper('admin');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user2.shareKey'));
+
+ // tear down
+ \OC_User::deleteUser('user2');
+ }
}
function loginHelper($user, $create=false) {
@@ -114,6 +176,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OC_User::createUser($user, $user);
}
+ \OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC_Util::setupFS($user);
\OC_User::setUserId($user);
--
GitLab
From fdc49e7acbced4d09e4e96ea870ae25a9a32cbca Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 22:56:59 +0200
Subject: [PATCH 145/304] added test for share folder
---
apps/files_encryption/tests/share.php | 73 +++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 11a3864540..eba5dd5195 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -166,8 +166,81 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user2.shareKey'));
+ // share the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
+
// tear down
\OC_User::deleteUser('user2');
+ \OC_User::deleteUser('user1');
+ }
+ }
+
+ function testShareFolder($withTeardown = true) {
+ // create user1
+ $this->loginHelper('user1', true);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ $folder1 = '/folder1';
+ $subfolder = '/subfolder1';
+ $subsubfolder = '/subsubfolder1';
+
+ $filename = 'share-tmp.test';
+
+ $this->view->mkdir('/admin/files'.$folder1);
+ $this->view->mkdir('/admin/files'.$folder1.$subfolder);
+ $this->view->mkdir('/admin/files'.$folder1.$subfolder.$subsubfolder);
+
+ $cryptedFile = file_put_contents( 'crypt://' . $folder1.$subfolder.$subsubfolder.'/'.$filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file infos
+ $fileInfo = $this->view->getFileInfo('/admin/files/folder1/');
+
+ // check if we have fileInfos
+ $this->assertTrue(is_array($fileInfo));
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+
+ $this->loginHelper('admin');
+
+ // check if share key exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.user1.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared'.$folder1.$subfolder.$subsubfolder.'/'.$filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+
+ if($withTeardown) {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // share the file
+ \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.user1.shareKey'));
+
+ // tear down
+ \OC_User::deleteUser('user1');
}
}
--
GitLab
From 28866de44bbf5c5bc2b1e0689b5139047ba5273b Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 8 May 2013 16:22:08 +0200
Subject: [PATCH 146/304] Added pre_share hook Switched it for post_share hook
in encryption hooks Stop a file from being shared if the encryption procedure
fails for any users
---
apps/files_encryption/appinfo/app.php | 2 +-
apps/files_encryption/hooks/hooks.php | 17 ++-
apps/files_encryption/lib/util.php | 9 +-
lib/public/share.php | 169 ++++++++++++++++++--------
4 files changed, 130 insertions(+), 67 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index a7253c4333..7f01aaeebe 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -16,7 +16,7 @@ OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login'
OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
// Sharing-related hooks
-OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
+OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index ddec839acd..1f642f4841 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -183,7 +183,7 @@ class Hooks {
/**
* @brief
*/
- public static function postShared( $params ) {
+ public static function preShared( $params ) {
// NOTE: $params has keys:
// [itemType] => file
@@ -201,6 +201,7 @@ class Hooks {
// [fileTarget] => /test8
// [id] => 10
// [token] =>
+ // [run] => whether emitting script should continue to run
// TODO: Should other kinds of item be encrypted too?
if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
@@ -249,7 +250,7 @@ class Hooks {
// rebuild path
foreach ( $targetPathSplit as $pathPart ) {
- if( $pathPart !== $sharedPart ) {
+ if ( $pathPart !== $sharedPart ) {
$path = '/' . $pathPart . $path;
@@ -295,15 +296,13 @@ class Hooks {
$failed[] = $path;
}
}
-
- // If no attempts to set keyfiles failed
- if ( empty( $failed ) ) {
- return true;
+ // If some attempts to set keyfiles failed
+ if ( ! empty( $failed ) ) {
- } else {
-
- return false;
+ // Set flag var 'run' to notify emitting
+ // script that hook execution failed
+ $params['run']->run = false;
}
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 5ab5ea6425..871d3bcfc3 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -146,7 +146,7 @@ class Util {
return false;
} else {
-
+
return true;
}
@@ -855,15 +855,14 @@ class Util {
* @param string $filePath path of the file to be shared
*/
public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
-
+
// Make sure users are capable of sharing
$filteredUids = $this->filterShareReadyUsers( $users );
if ( ! empty( $filteredUids['unready'] ) ) {
- // Notify user of unready userDir
- // TODO: Move this out of here; it belongs somewhere else
- \OCP\JSON::error();
+ // TODO: Notify user of unready userDir
+ \OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"'.print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
}
diff --git a/lib/public/share.php b/lib/public/share.php
index fee906d187..cb151b9f4b 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1223,42 +1223,12 @@ class Share {
} else {
$groupFileTarget = null;
}
- $query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType,
- $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
- // Save this id, any extra rows for this group share will need to reference it
- $parent = \OC_DB::insertid('*PREFIX*share');
- // Loop through all users of this group in case we need to add an extra row
- foreach ($shareWith['users'] as $uid) {
- $itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid,
- $uidOwner, $suggestedItemTarget, $parent);
- if (isset($fileSource)) {
- if ($parentFolder) {
- if ($parentFolder === true) {
- $fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid,
- $uidOwner, $suggestedFileTarget, $parent);
- if ($fileTarget != $groupFileTarget) {
- $parentFolders[$uid]['folder'] = $fileTarget;
- }
- } else if (isset($parentFolder[$uid])) {
- $fileTarget = $parentFolder[$uid]['folder'].$itemSource;
- $parent = $parentFolder[$uid]['id'];
- }
- } else {
- $fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
- $uid, $uidOwner, $suggestedFileTarget, $parent);
- }
- } else {
- $fileTarget = null;
- }
- // Insert an extra row for the group share if the item or file target is unique for this user
- if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
- $query->execute(array($itemType, $itemSource, $itemTarget, $parent,
- self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(),
- $fileSource, $fileTarget, $token));
- $id = \OC_DB::insertid('*PREFIX*share');
- }
- }
- \OC_Hook::emit('OCP\Share', 'post_shared', array(
+ // Trigger hooks before the share is added to DB
+ // Set flag indicating if execution should continue.
+ // Use an object as workaround for pass by reference issues
+ $run = new \stdClass();
+ $run->run = true;
+ $params = array(
'itemType' => $itemType,
'itemSource' => $itemSource,
'itemTarget' => $groupItemTarget,
@@ -1270,11 +1240,73 @@ class Share {
'fileSource' => $fileSource,
'fileTarget' => $groupFileTarget,
'id' => $parent,
- 'token' => $token
- ));
- if ($parentFolder === true) {
- // Return parent folders to preserve file target paths for potential children
- return $parentFolders;
+ 'token' => $token,
+ 'run' => $run
+ );
+ $run = \OC_Hook::emit(
+ 'OCP\Share'
+ , 'pre_shared'
+ , $params
+ );
+ // If hook execution didn't encounter errors
+ if ( ! $run->run ) {
+ $message = 'Sharing '.$itemSource.' failed, because pre share hooks failed';
+ \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+ return false;
+ } else {
+ $query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType,
+ $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
+ // Save this id, any extra rows for this group share will need to reference it
+ $parent = \OC_DB::insertid('*PREFIX*share');
+ // Loop through all users of this group in case we need to add an extra row
+ foreach ($shareWith['users'] as $uid) {
+ $itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid,
+ $uidOwner, $suggestedItemTarget, $parent);
+ if (isset($fileSource)) {
+ if ($parentFolder) {
+ if ($parentFolder === true) {
+ $fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid,
+ $uidOwner, $suggestedFileTarget, $parent);
+ if ($fileTarget != $groupFileTarget) {
+ $parentFolders[$uid]['folder'] = $fileTarget;
+ }
+ } else if (isset($parentFolder[$uid])) {
+ $fileTarget = $parentFolder[$uid]['folder'].$itemSource;
+ $parent = $parentFolder[$uid]['id'];
+ }
+ } else {
+ $fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
+ $uid, $uidOwner, $suggestedFileTarget, $parent);
+ }
+ } else {
+ $fileTarget = null;
+ }
+ // Insert an extra row for the group share if the item or file target is unique for this user
+ if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
+ $query->execute(array($itemType, $itemSource, $itemTarget, $parent,
+ self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(),
+ $fileSource, $fileTarget, $token));
+ $id = \OC_DB::insertid('*PREFIX*share');
+ }
+ }
+ \OC_Hook::emit('OCP\Share', 'post_shared', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $groupItemTarget,
+ 'parent' => $parent,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith['group'],
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'fileSource' => $fileSource,
+ 'fileTarget' => $groupFileTarget,
+ 'id' => $parent,
+ 'token' => $token
+ ));
+ if ($parentFolder === true) {
+ // Return parent folders to preserve file target paths for potential children
+ return $parentFolders;
+ }
}
} else {
$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
@@ -1296,10 +1328,14 @@ class Share {
} else {
$fileTarget = null;
}
- $query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner,
- $permissions, time(), $fileSource, $fileTarget, $token));
- $id = \OC_DB::insertid('*PREFIX*share');
- \OC_Hook::emit('OCP\Share', 'post_shared', array(
+ // Trigger hooks before the share is added to DB
+ // Set flag indicating if execution should continue.
+ // Use an object as workaround for pass by reference issues
+ $run = new \stdClass();
+ $run->run = true;
+ // NOTE: [id] isn't included as it's not yet available
+ // (hasn't been inserted)
+ $params = array(
'itemType' => $itemType,
'itemSource' => $itemSource,
'itemTarget' => $itemTarget,
@@ -1310,13 +1346,42 @@ class Share {
'permissions' => $permissions,
'fileSource' => $fileSource,
'fileTarget' => $fileTarget,
- 'id' => $id,
- 'token' => $token
- ));
- if ($parentFolder === true) {
- $parentFolders['id'] = $id;
- // Return parent folder to preserve file target paths for potential children
- return $parentFolders;
+ 'token' => $token,
+ 'run' => $run
+ );
+ \OC_Hook::emit(
+ 'OCP\Share'
+ , 'pre_shared'
+ , $params
+ );
+ // If hook execution didn't encounter errors
+ if ( ! $run->run ) {
+ $message = 'Sharing '.$itemSource.' failed, because pre share hooks failed';
+ \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+ return false;
+ } else {
+ $query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner,
+ $permissions, time(), $fileSource, $fileTarget, $token));
+ $id = \OC_DB::insertid('*PREFIX*share');
+ \OC_Hook::emit('OCP\Share', 'post_shared', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $itemTarget,
+ 'parent' => $parent,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith,
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'fileSource' => $fileSource,
+ 'fileTarget' => $fileTarget,
+ 'id' => $id,
+ 'token' => $token
+ ));
+ if ($parentFolder === true) {
+ $parentFolders['id'] = $id;
+ // Return parent folder to preserve file target paths for potential children
+ return $parentFolders;
+ }
}
}
return true;
--
GitLab
From 101e037529fef0273ba9d4de522d2e47d8a6ef0b Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 9 May 2013 14:43:06 +0200
Subject: [PATCH 147/304] Fixed bugs with pre_share hook usage Made sure new
user being shared to is added to array of sharing users
---
apps/files_encryption/hooks/hooks.php | 18 ++-
apps/files_encryption/lib/util.php | 176 +++++++++++++++-----------
2 files changed, 115 insertions(+), 79 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 1f642f4841..e8cd4ade71 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -277,21 +277,28 @@ class Hooks {
// if a folder was shared, get a list if all (sub-)folders
if ( $params['itemType'] === 'folder' ) {
- $allFiles = $util->getAllFiles($path);
+
+ $allFiles = $util->getAllFiles( $path );
+
} else {
$allFiles = array( $path );
}
+
+ // Set array for collecting paths which can't be shared
+ $failed = array();
foreach ( $allFiles as $path ) {
$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path );
-
- $failed = array();
+
+ // Because this is a pre_share hook, the user
+ // being shared to is not yet included; add them
+ $usersSharing[] = $params['shareWith'];
// Attempt to set shareKey
- if ( !$util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
+ if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
$failed[] = $path;
}
@@ -304,6 +311,9 @@ class Hooks {
// script that hook execution failed
$params['run']->run = false;
+ // TODO: Make sure files_sharing provides user
+ // feedback on failed share
+
}
}
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 871d3bcfc3..068f714842 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -3,8 +3,8 @@
* ownCloud
*
* @author Sam Tuke, Frank Karlitschek
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Frank Karlitschek frank@owncloud.org
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>,
+ * Frank Karlitschek <frank@owncloud.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -88,16 +88,9 @@ class Util {
//// TODO: add support for optional recovery in case of lost passphrase / keys
//// TODO: add admin optional required long passphrase for users
- //// TODO: add UI buttons for encrypt / decrypt everything
//// TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
- // Sharing:
-
- //// TODO: add support for encrypting to multiple public keys
- //// TODO: add support for decrypting to multiple private keys
-
-
// Integration testing:
//// TODO: test new encryption with versioning
@@ -136,11 +129,11 @@ class Util {
public function ready() {
if(
- !$this->view->file_exists( $this->encryptionDir )
- or !$this->view->file_exists( $this->keyfilesPath )
- or !$this->view->file_exists( $this->shareKeysPath )
- or !$this->view->file_exists( $this->publicKeyPath )
- or !$this->view->file_exists( $this->privateKeyPath )
+ ! $this->view->file_exists( $this->encryptionDir )
+ or ! $this->view->file_exists( $this->keyfilesPath )
+ or ! $this->view->file_exists( $this->shareKeysPath )
+ or ! $this->view->file_exists( $this->publicKeyPath )
+ or ! $this->view->file_exists( $this->privateKeyPath )
) {
return false;
@@ -471,9 +464,8 @@ class Util {
/**
* @brief get the file size of the unencrypted file
- *
* @param $path absolute path
- * @return true / false if file is encrypted
+ * @return bool
*/
public function getFileSize($path) {
@@ -768,7 +760,7 @@ class Util {
* @return multi-dimensional array. keys: ready, unready
*/
public function filterShareReadyUsers( $unfilteredUsers ) {
-
+
// This array will collect the filtered IDs
$readyIds = $unreadyIds = array();
@@ -780,8 +772,8 @@ class Util {
// Check that the user is encryption capable, or is the
// public system user 'ownCloud' (for public shares)
if (
- $util->ready()
- or $user == 'owncloud'
+ $user == 'owncloud'
+ or $util->ready()
) {
// Construct array of ready UIDs for Keymanager{}
@@ -853,22 +845,27 @@ class Util {
* @brief Encrypt keyfile to multiple users
* @param array $users list of users which should be able to access the file
* @param string $filePath path of the file to be shared
+ * @return bool
*/
public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
// Make sure users are capable of sharing
$filteredUids = $this->filterShareReadyUsers( $users );
+ // If we're attempting to share to unready users
if ( ! empty( $filteredUids['unready'] ) ) {
-
- // TODO: Notify user of unready userDir
+
\OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"'.print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
+ return false;
+
}
// Get public keys for each user, ready for generating sharekeys
$userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
-
+
+ // Note proxy status then disable it
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// Get the current users's private key for decrypting existing keyfile
@@ -884,21 +881,19 @@ class Util {
// Save the recrypted key to it's owner's keyfiles directory
// Save new sharekeys to all necessary user directory
- // TODO: Reuse the keyfile, it it exists, instead of making a new one
if (
! Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
|| ! Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
) {
- trigger_error( "SET Share keys failed" );
+ \OC_Log::write( 'Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR );
+
+ return false;
}
-
- // Delete existing keyfile
- // Do this last to ensure file is recoverable in case of error
- // Keymanager::deleteFileKey( $this->view, $this->userId, $params['fileTarget'] );
-
- \OC_FileProxy::$enabled = true;
+
+ // Return proxy to original status
+ \OC_FileProxy::$enabled = $proxyStatus;
return true;
}
@@ -948,7 +943,7 @@ class Util {
// add current user if given
if ( $currentUserId != false ) {
- $userIds[] = $currentUserId;
+ $userIds[] = $currentUserId;
}
@@ -961,6 +956,7 @@ class Util {
/**
* @brief Set file migration status for user
+ * @return bool
*/
public function setMigrationStatus( $status ) {
@@ -1089,42 +1085,59 @@ class Util {
* @param type $dir relative to the users files folder
* @return array with list of files relative to the users files folder
*/
- public function getAllFiles($dir) {
+ public function getAllFiles( $dir ) {
+
$result = array();
- $content = $this->view->getDirectoryContent($this->userFilesDir.$dir);
+ $content = $this->view->getDirectoryContent( $this->userFilesDir . $dir );
- // handling for re shared folders
- $path_split = explode( '/', $dir );
- $shared = '';
- if($path_split[1] === 'Shared') {
- $shared = '/Shared';
- }
+ // handling for re shared folders
+ $path_split = explode( '/', $dir );
+ $shared = '';
+
+ if( $path_split[1] === 'Shared' ) {
+
+ $shared = '/Shared';
+
+ }
- foreach ($content as $c) {
- $sharedPart = $path_split[sizeof($path_split)-1];
- $targetPathSplit = array_reverse(explode('/', $c['path']));
+ foreach ( $content as $c ) {
+
+ $sharedPart = $path_split[sizeof( $path_split )-1];
+ $targetPathSplit = array_reverse( explode( '/', $c['path'] ) );
- $path = '';
+ $path = '';
- // rebuild path
- foreach ($targetPathSplit as $pathPart) {
- if($pathPart !== $sharedPart) {
- $path = '/'.$pathPart.$path;
- } else {
- break;
- }
- }
+ // rebuild path
+ foreach ( $targetPathSplit as $pathPart ) {
+
+ if ( $pathPart !== $sharedPart ) {
+
+ $path = '/' . $pathPart . $path;
+
+ } else {
+
+ break;
+
+ }
+
+ }
- $path = $dir.$path;
+ $path = $dir.$path;
if ($c['type'] === "dir" ) {
- $result = array_merge($result, $this->getAllFiles($path));
+
+ $result = array_merge( $result, $this->getAllFiles( $path ) );
+
} else {
- $result[] = $path;
+
+ $result[] = $path;
+
}
}
+
return $result;
+
}
/**
@@ -1132,7 +1145,7 @@ class Util {
* @param int $Id of the current share
* @return array of the parent
*/
- public static function getShareParent($Id) {
+ public static function getShareParent( $Id ) {
$query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
.' FROM `*PREFIX*share`'
@@ -1152,26 +1165,39 @@ class Util {
* @return owner
*/
public function getOwnerFromSharedFile($id) {
- $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $source = $query->execute(array($id))->fetchRow();
-
- if (isset($source['parent'])) {
- $parent = $source['parent'];
- while (isset($parent)) {
- $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $item = $query->execute(array($parent))->fetchRow();
- if (isset($item['parent'])) {
- $parent = $item['parent'];
- } else {
- $fileOwner = $item['uid_owner'];
- break;
- }
- }
- } else {
- $fileOwner = $source['uid_owner'];
- }
+
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $source = $query->execute( array( $id ) )->fetchRow();
- return $fileOwner;
- }
+ if ( isset($source['parent'] ) ) {
+
+ $parent = $source['parent'];
+
+ while ( isset( $parent ) ) {
+
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $item = $query->execute( array( $parent ) )->fetchRow();
+
+ if ( isset( $item['parent'] ) ) {
+
+ $parent = $item['parent'];
+
+ } else {
+
+ $fileOwner = $item['uid_owner'];
+
+ break;
+
+ }
+ }
+
+ } else {
+
+ $fileOwner = $source['uid_owner'];
+
+ }
+
+ return $fileOwner;
+ }
}
--
GitLab
From 3003dd46d17e9d4b70a5b19d4a7807bb0fbad298 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 9 May 2013 18:09:20 +0200
Subject: [PATCH 148/304] Implemented initial recoveryAdmin functionality in
crypto file proxy
---
apps/files_encryption/lib/proxy.php | 83 +++++++++++++++++++++--------
apps/files_encryption/lib/util.php | 22 ++++++--
2 files changed, 80 insertions(+), 25 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 820b7d8b67..ae36b9fe09 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -93,29 +93,29 @@ class Proxy extends \OC_FileProxy {
public function preFile_put_contents( $path, &$data ) {
- if ( self::shouldEncrypt( $path ) ) {
+ if ( self::shouldEncrypt( $path ) ) {
- // Stream put contents should have been converted to fopen
+ // Stream put contents should have been converted to fopen
if ( !is_resource( $data ) ) {
- $userId = \OCP\USER::getUser();
- $rootView = new \OC_FilesystemView( '/' );
- $util = new Util( $rootView, $userId );
- $session = new Session( $rootView );
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+ $session = new Session( $view );
$privateKey = $session->getPrivateKey();
$filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
$size = strlen( $data );
-
+
// Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
// Check if there is an existing key we can reuse
- if ( $encKeyfile = Keymanager::getFileKey( $rootView, $userId, $filePath ) ) {
+ if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
// Fetch shareKey
- $shareKey = Keymanager::getShareKey( $rootView, $userId, $filePath );
+ $shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
// Decrypt the keyfile
$plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
@@ -124,7 +124,7 @@ class Proxy extends \OC_FileProxy {
// Make a new key
$plainKey = Crypt::generateKey();
-
+
}
// Encrypt data
@@ -134,34 +134,73 @@ class Proxy extends \OC_FileProxy {
$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
- // Fetch public keys for all users who will share the file
- $publicKeys = Keymanager::getPublicKeys( $rootView, $uniqueUserIds );
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
- // Encrypt plain keyfile to multiple sharefiles
+ // Encrypt plain keyfile to multiple sharefiles
$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
// Save sharekeys to user folders
- Keymanager::setShareKeys( $rootView, $filePath, $multiEncrypted['keys'] );
+ Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
// Set encrypted keyfile as common varname
$encKey = $multiEncrypted['data'];
// Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $rootView, $filePath, $userId, $encKey );
+ Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
// Replace plain content with encrypted content by reference
$data = $encData;
-
+
// Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted'=>true, 'size' => strlen($size), 'unencrypted_size' => $size), '' );
+ \OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted'=>true, 'size' => strlen($size), 'unencrypted_size' => $size), '' );
- // Re-enable proxy - our work is done
+ // Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
}
}
- return true;
+ return true;
+
+ }
+
+ public function postFile_put_contents( $path, $length ) {
+
+ $userId = \OCP\USER::getUser();
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+
+ // Check if recoveryAdmin is enabled for system and user
+ // TODO: Consider storing recoveryAdmin status for user in session
+ if (
+ \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' )
+ && $util->recoveryEnabledForUser()
+ ) {
+
+ // Get owner UID and filepath
+ list( $owner, $ownerPath ) = $util->getUidAndFilename( $path );
+
+ $recoveryAdminUid = \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+ $usersSharing = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
+
+ // Check if file is already shared to recoveryAdmin
+ if ( ! in_array( $recoveryAdminUid, $usersSharing ) ) {
+
+ $relPath = $util->stripFilesPath( $path );
+
+ // Get file info from filecache
+ $fileInfo = \OC\Files\Filesystem::getFileInfo( $path );
+
+ // Register share to recoveryAdmin with share API
+ // FIXME: Some of these vars aren't set
+ // FIXME: What should the permission number be to grant all rights?
+// \OCP\Share::shareItem( $itemType, $itemSource, 0, $recoveryAdminUid, 17 );
+
+ }
+
+ }
+
}
/**
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 068f714842..41d51fbf6f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -548,6 +548,7 @@ class Util {
/**
* @brief Format a path to be relative to the /user/files/ directory
+ * @note e.g. turns '/admin/files/test.txt' into 'test.txt'
*/
public function stripUserFilesPath( $path ) {
@@ -560,6 +561,21 @@ class Util {
}
+ /**
+ * @brief Format a path to be relative to the /user directory
+ * @note e.g. turns '/admin/files/test.txt' into 'files/test.txt'
+ */
+ public function stripFilesPath( $path ) {
+
+ $trimmed = ltrim( $path, '/' );
+ $split = explode( '/', $trimmed );
+ $sliced = array_slice( $split, 1 );
+ $relPath = implode( '/', $sliced );
+
+ return $relPath;
+
+ }
+
/**
* @brief Format a shared path to be relative to the /user/files/ directory
* @note Expects a path like /uid/files/Shared/filepath
@@ -1142,16 +1158,16 @@ class Util {
/**
* @brief get shares parent.
- * @param int $Id of the current share
+ * @param int $id of the current share
* @return array of the parent
*/
- public static function getShareParent( $Id ) {
+ public static function getShareParent( $id ) {
$query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
.' FROM `*PREFIX*share`'
.' WHERE `id` = ?' );
- $result = $query->execute( array( $Id ) );
+ $result = $query->execute( array( $id ) );
$row = $result->fetchRow();
--
GitLab
From 92e28839ffe31c5173fe49481705db15a3a4acb2 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 9 May 2013 18:16:59 +0200
Subject: [PATCH 149/304] Improvements to code formatting & indentation
---
apps/files_encryption/lib/util.php | 223 +++++++++++++++--------------
1 file changed, 114 insertions(+), 109 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 41d51fbf6f..04b1e66f58 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -305,7 +305,6 @@ class Util {
* @brief Find all files and their encryption status within a directory
* @param string $directory The path of the parent directory to search
* @return mixed false if 0 found, array on success. Keys: name, path
-
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
@@ -444,10 +443,10 @@ class Util {
return $text;
}
- /**
- * @brief Check if a given path identifies an encrypted file
- * @return true / false
- */
+ /**
+ * @brief Check if a given path identifies an encrypted file
+ * @return true / false
+ */
public function isEncryptedPath( $path ) {
// Disable encryption proxy so data retreived is in its
@@ -462,89 +461,94 @@ class Util {
}
- /**
- * @brief get the file size of the unencrypted file
- * @param $path absolute path
- * @return bool
- */
+ /**
+ * @brief get the file size of the unencrypted file
+ * @param $path absolute path
+ * @return bool
+ */
- public function getFileSize($path) {
- $result = 0;
+ public function getFileSize( $path ) {
+
+ $result = 0;
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // Reformat path for use with OC_FSV
- $pathSplit = explode( '/', $path );
- $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
+ // Reformat path for use with OC_FSV
+ $pathSplit = explode( '/', $path );
+ $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
- if ($pathSplit[2] == 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
+ if ($pathSplit[2] == 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
- // get the size from filesystem
- $fullPath = $this->view->getLocalFile($path);
- $size = filesize($fullPath);
+ // get the size from filesystem
+ $fullPath = $this->view->getLocalFile($path);
+ $size = filesize($fullPath);
- // calculate last chunk nr
- $lastChunckNr = floor($size / 8192);
+ // calculate last chunk nr
+ $lastChunckNr = floor($size / 8192);
- // open stream
- $stream = fopen('crypt://' . $pathRelative, "r");
+ // open stream
+ $stream = fopen('crypt://' . $pathRelative, "r");
- if(is_resource($stream)) {
- // calculate last chunk position
- $lastChunckPos = ($lastChunckNr * 8192);
+ if(is_resource($stream)) {
+ // calculate last chunk position
+ $lastChunckPos = ($lastChunckNr * 8192);
- // seek to end
- fseek($stream, $lastChunckPos);
+ // seek to end
+ fseek($stream, $lastChunckPos);
- // get the content of the last chunk
- $lastChunkContent = fread($stream, 8192);
+ // get the content of the last chunk
+ $lastChunkContent = fread($stream, 8192);
- // calc the real file size with the size of the last chunk
- $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
+ // calc the real file size with the size of the last chunk
+ $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
- // store file size
- $result = $realSize;
- }
- }
+ // store file size
+ $result = $realSize;
+ }
+ }
- \OC_FileProxy::$enabled = $proxyStatus;
+ \OC_FileProxy::$enabled = $proxyStatus;
- return $result;
- }
- /**
- * @brief fix the file size of the encrypted file
- *
- * @param $path absolute path
- * @return true / false if file is encrypted
- */
+ return $result;
+ }
+
+ /**
+ * @brief fix the file size of the encrypted file
+ * @param $path absolute path
+ * @return true / false if file is encrypted
+ */
- public function fixFileSize($path) {
- $result = false;
+ public function fixFileSize( $path ) {
+
+ $result = false;
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- $realSize = $this->getFileSize($path);
- if($realSize > 0) {
- $cached = $this->view->getFileInfo($path);
- $cached['encrypted'] = 1;
+ $realSize = $this->getFileSize( $path );
+
+ if ( $realSize > 0 ) {
+
+ $cached = $this->view->getFileInfo( $path );
+ $cached['encrypted'] = 1;
- // set the size
- $cached['unencrypted_size'] = $realSize;
+ // set the size
+ $cached['unencrypted_size'] = $realSize;
- // put file info
- $this->view->putFileInfo( $path, $cached );
+ // put file info
+ $this->view->putFileInfo( $path, $cached );
- $result = true;
- }
+ $result = true;
+
+ }
- \OC_FileProxy::$enabled = $proxyStatus;
+ \OC_FileProxy::$enabled = $proxyStatus;
- return $result;
- }
+ return $result;
+ }
/**
* @brief Format a path to be relative to the /user/files/ directory
@@ -640,7 +644,7 @@ class Util {
stream_copy_to_stream( $plainHandle1, $plainHandle2 );
// Close access to original file
-// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
+ // $this->view->fclose( $plainHandle1 ); // not implemented in view{}
// Delete original plain file so we can rename enc file later
$this->view->unlink( $rawPath );
@@ -1156,64 +1160,65 @@ class Util {
}
- /**
- * @brief get shares parent.
- * @param int $id of the current share
- * @return array of the parent
- */
- public static function getShareParent( $id ) {
-
- $query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
- .' FROM `*PREFIX*share`'
- .' WHERE `id` = ?' );
+ /**
+ * @brief get shares parent.
+ * @param int $id of the current share
+ * @return array of the parent
+ */
+ public static function getShareParent( $id ) {
- $result = $query->execute( array( $id ) );
+ $query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
+ .' FROM `*PREFIX*share`'
+ .' WHERE `id` = ?' );
- $row = $result->fetchRow();
+ $result = $query->execute( array( $id ) );
- return $row;
+ $row = $result->fetchRow();
- }
+ return $row;
- /**
- * @brief get owner of the shared files.
- * @param int $Id of a share
- * @return owner
- */
- public function getOwnerFromSharedFile($id) {
-
- $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
- $source = $query->execute( array( $id ) )->fetchRow();
+ }
- if ( isset($source['parent'] ) ) {
+ /**
+ * @brief get owner of the shared files.
+ * @param int $Id of a share
+ * @return owner
+ */
+ public function getOwnerFromSharedFile( $id ) {
- $parent = $source['parent'];
-
- while ( isset( $parent ) ) {
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $source = $query->execute( array( $id ) )->fetchRow();
+
+ if ( isset($source['parent'] ) ) {
- $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
- $item = $query->execute( array( $parent ) )->fetchRow();
+ $parent = $source['parent'];
- if ( isset( $item['parent'] ) ) {
+ while ( isset( $parent ) ) {
- $parent = $item['parent'];
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $item = $query->execute( array( $parent ) )->fetchRow();
+
+ if ( isset( $item['parent'] ) ) {
+
+ $parent = $item['parent'];
+
+ } else {
+
+ $fileOwner = $item['uid_owner'];
+
+ break;
+
+ }
+ }
- } else {
+ } else {
- $fileOwner = $item['uid_owner'];
-
- break;
+ $fileOwner = $source['uid_owner'];
- }
}
-
- } else {
-
- $fileOwner = $source['uid_owner'];
-
- }
return $fileOwner;
+
}
}
--
GitLab
From 163fe6401609a9bdb4ee71127e4f6724b1804af0 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Thu, 9 May 2013 18:24:07 +0200
Subject: [PATCH 150/304] Fixes to code formatting and indentation
---
apps/files_encryption/lib/keymanager.php | 166 ++++++++++++++---------
1 file changed, 99 insertions(+), 67 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 51d4f8ffc0..6c2df6f840 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -113,8 +113,8 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util($view, \OCP\User::getUser());
- list($owner, $filename) = $util->getUidAndFilename($path);
+ $util = new Util( $view, \OCP\User::getUser() );
+ list( $owner, $filename ) = $util->getUidAndFilename( $path );
$basePath = '/' . $owner . '/files_encryption/keyfiles';
@@ -123,19 +123,26 @@ class Keymanager {
if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
// create all parent folders
- $info=pathinfo($basePath . '/' . $targetPath);
- $keyfileFolderName=$view->getLocalFolder($info['dirname']);
- if(!file_exists($keyfileFolderName)) {
- mkdir($keyfileFolderName, 0750, true);
+ $info = pathinfo( $basePath . '/' . $targetPath );
+ $keyfileFolderName = $view->getLocalFolder( $info['dirname'] );
+
+ if ( ! file_exists( $keyfileFolderName ) ) {
+
+ mkdir( $keyfileFolderName, 0750, true );
+
}
}
- // try reusing key file if part file
- if(self::isPartialFilePath($targetPath)) {
- $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile );
- } else {
- $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
- }
+ // try reusing key file if part file
+ if ( self::isPartialFilePath( $targetPath ) ) {
+
+ $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
+
+ } else {
+
+ $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+
+ }
\OC_FileProxy::$enabled = $proxyStatus;
@@ -143,37 +150,47 @@ class Keymanager {
}
- /**
- * @brief Remove .path extension from a file path
- * @param string $path Path that may identify a .part file
- * @return string File path without .part extension
- * @note this is needed for reusing keys
- */
- public static function fixPartialFilePath($path)
- {
- if (preg_match('/\.part$/', $path)) {
+ /**
+ * @brief Remove .path extension from a file path
+ * @param string $path Path that may identify a .part file
+ * @return string File path without .part extension
+ * @note this is needed for reusing keys
+ */
+ public static function fixPartialFilePath( $path ) {
+
+ if (preg_match('/\.part$/', $path)) {
- $newLength = strlen($path) - 5;
- $fPath = substr($path, 0, $newLength);
+ $newLength = strlen($path) - 5;
+ $fPath = substr($path, 0, $newLength);
- return $fPath;
- } else {
+ return $fPath;
+
+ } else {
- return $path;
+ return $path;
- }
+ }
- }
+ }
- public static function isPartialFilePath($path)
- {
- if (preg_match('/\.part$/', $path)) {
- return true;
- } else {
- return false;
- }
+ /**
+ * @brief Check if a path is a .part file
+ * @param string $path Path that may identify a .part file
+ * @return bool
+ */
+ public static function isPartialFilePath( $path ) {
+
+ if ( preg_match('/\.part$/', $path ) ) {
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
- }
+ }
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
@@ -186,21 +203,26 @@ class Keymanager {
*/
public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
- // try reusing key file if part file
- if(self::isPartialFilePath($filePath)) {
- $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
- if($result) {
- return $result;
- }
- }
+ // try reusing key file if part file
+ if ( self::isPartialFilePath( $filePath ) ) {
+
+ $result = self::getFileKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
+
+ if ( $result ) {
+
+ return $result;
+
+ }
+
+ }
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
$filePath_f = ltrim( $filename, '/' );
- $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if ( $view->file_exists( $keyfilePath ) ) {
@@ -269,7 +291,7 @@ class Keymanager {
$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
@@ -278,7 +300,8 @@ class Keymanager {
\OC_FileProxy::$enabled = $proxyStatus;
- return $result;
+ return $result;
+
}
/**
@@ -304,7 +327,7 @@ class Keymanager {
$view = new \OC_FilesystemView( '/public-keys' );
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
@@ -313,7 +336,7 @@ class Keymanager {
\OC_FileProxy::$enabled = $proxyStatus;
- return $result;
+ return $result;
}
@@ -330,28 +353,32 @@ class Keymanager {
*/
public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
- //here we need the currently logged in user, while userId can be a different user
+ // Here we need the currently logged in user, while userId can be a different user
$util = new Util( $view, \OCP\User::getUser() );
- list($owner, $filename) = $util->getUidAndFilename($path);
+ list( $owner, $filename ) = $util->getUidAndFilename( $path );
$basePath = '/' . $owner . '/files_encryption/share-keys';
$shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
- // try reusing key file if part file
- if(self::isPartialFilePath($shareKeyPath)) {
- $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
- } else {
- $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
- }
+ // try reusing key file if part file
+ if(self::isPartialFilePath($shareKeyPath)) {
+
+ $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+
+ } else {
+
+ $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+
+ }
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$result = $view->file_put_contents( $writePath, $shareKey );
- \OC_FileProxy::$enabled = $proxyStatus;
+ \OC_FileProxy::$enabled = $proxyStatus;
if (
is_int( $result )
@@ -407,15 +434,20 @@ class Keymanager {
*/
public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
- // try reusing key file if part file
- if(self::isPartialFilePath($filePath)) {
- $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
- if($result) {
- return $result;
- }
- }
+ // try reusing key file if part file
+ if(self::isPartialFilePath($filePath)) {
+
+ $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
+
+ if($result) {
+
+ return $result;
+
+ }
+
+ }
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
--
GitLab
From e25aa78cafda9d922d70c1a1223009df5da93786 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 9 May 2013 19:36:18 +0200
Subject: [PATCH 151/304] added helper class and moved hook registration to it
---
apps/files_encryption/appinfo/app.php | 21 ++++----
apps/files_encryption/lib/helper.php | 71 +++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 11 deletions(-)
create mode 100755 apps/files_encryption/lib/helper.php
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 7f01aaeebe..b611eb798f 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -8,23 +8,21 @@ OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
+OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
OC_FileProxy::register( new OCA\Encryption\Proxy() );
-// User-related hooks
-OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+// User related hooks
+OCA\Encryption\Helper::registerUserHooks();
-// Sharing-related hooks
-OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
-OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
+// Sharing related hooks
+OCA\Encryption\Helper::registerShareHooks();
-// Webdav-related hooks
-OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
+// Webdav related hooks
+OCA\Encryption\Helper::registerWebdavHooks();
-// filesystem hooks
-OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+// Filesystem related hooks
+OCA\Encryption\Helper::registerFilesystemHooks();
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
@@ -52,3 +50,4 @@ if (
// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
+
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
new file mode 100755
index 0000000000..b294a71ec1
--- /dev/null
+++ b/apps/files_encryption/lib/helper.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage registration of hooks an various helper methods
+ */
+class Helper {
+
+ /**
+ * @brief register share related hooks
+ *
+ */
+ public static function registerShareHooks() {
+
+ \OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
+ }
+
+ /**
+ * @brief register user related hooks
+ *
+ */
+ public static function registerUserHooks() {
+
+ \OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
+ \OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+ }
+
+ /**
+ * @brief register webdav related hooks
+ *
+ */
+ public static function registerWebdavHooks() {
+
+ \OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
+ }
+
+ /**
+ * @brief register filesystem related hooks
+ *
+ */
+ public static function registerFilesystemHooks() {
+
+ \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+ }
+
+
+}
\ No newline at end of file
--
GitLab
From de855ac31bbb7ccbf8632c0dd0bdf198d22a2c97 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 9 May 2013 19:37:26 +0200
Subject: [PATCH 152/304] improved tests and include helper
---
apps/files_encryption/tests/share.php | 76 +++++++++++++++++++--------
1 file changed, 53 insertions(+), 23 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index eba5dd5195..bfe34478f7 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -1,13 +1,25 @@
<?php
/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
- * Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
-//require_once "PHPUnit/Framework/TestCase.php";
require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
@@ -15,21 +27,11 @@ require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../lib/helper.php' );
require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-
-/**
- * @note It would be better to use Mockery here for mocking out the session
- * handling process, and isolate calls to session class and data from the unit
- * tests relating to them (stream etc.). However getting mockery to work and
- * overload classes whilst also using the OC autoloader is difficult due to
- * load order Pear errors.
- */
-
class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
function setUp() {
@@ -46,20 +48,30 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
OC_Hook::clear('OCP\\Share');
- // Sharing-related hooks
- OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
- OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
- OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
- OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+ // Sharing related hooks
+ OCA\Encryption\Helper::registerShareHooks();
+
+ // Filesystem related hooks
+ OCA\Encryption\Helper::registerFilesystemHooks();
OC_FileProxy::register( new OCA\Encryption\Proxy() );
OC::registerShareHooks();
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin
+ OC_App::disable('files_trashbin');
}
function tearDown() {
-
+ if($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
}
function testShareFile($withTeardown = true) {
@@ -120,6 +132,12 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// tear down
\OC_User::deleteUser('user1');
+
+ // cleanup
+ $this->view->unlink('/admin/files/'.$filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.admin.shareKey'));
}
}
@@ -175,6 +193,12 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// tear down
\OC_User::deleteUser('user2');
\OC_User::deleteUser('user1');
+
+ // cleanup
+ $this->view->unlink('/admin/files/'.$filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.admin.shareKey'));
}
}
@@ -239,6 +263,12 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.user1.shareKey'));
+ // cleanup
+ $this->view->unlink('/admin/files'.$folder1.$subfolder.$subsubfolder.'/'.$filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.admin.shareKey'));
+
// tear down
\OC_User::deleteUser('user1');
}
--
GitLab
From 990f23c0249682043c9e0dd42f33c478e2aa9131 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 9 May 2013 22:52:44 +0200
Subject: [PATCH 153/304] fix typo
---
lib/hooks/basicemitter.php | 2 +-
lib/hooks/emitter.php | 2 +-
tests/lib/hooks/basicemitter.php | 18 +++++++++---------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/hooks/basicemitter.php b/lib/hooks/basicemitter.php
index bd24539a40..e615a58cfe 100644
--- a/lib/hooks/basicemitter.php
+++ b/lib/hooks/basicemitter.php
@@ -35,7 +35,7 @@ abstract class BasicEmitter implements Emitter {
* @param string $method optional
* @param callable $callback optional
*/
- public function remoteListener($scope = null, $method = null, $callback = null) {
+ public function removeListener($scope = null, $method = null, $callback = null) {
$names = array();
$allNames = array_keys($this->listeners);
if ($scope and $method) {
diff --git a/lib/hooks/emitter.php b/lib/hooks/emitter.php
index 4219b6f354..8e9074bad6 100644
--- a/lib/hooks/emitter.php
+++ b/lib/hooks/emitter.php
@@ -28,5 +28,5 @@ interface Emitter {
* @param string $method optional
* @param callable $callback optional
*/
- public function remoteListener($scope = null, $method = null, $callback = null);
+ public function removeListener($scope = null, $method = null, $callback = null);
}
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
index 53de996c5c..f48dc53c56 100644
--- a/tests/lib/hooks/basicemitter.php
+++ b/tests/lib/hooks/basicemitter.php
@@ -153,7 +153,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
throw new EmittedException;
};
$this->emitter->listen('Test', 'test', $listener);
- $this->emitter->remoteListener('Test', 'test', $listener);
+ $this->emitter->removeListener('Test', 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
}
@@ -166,7 +166,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
};
$this->emitter->listen('Test', 'test', $listener1);
$this->emitter->listen('Test', 'test', $listener2);
- $this->emitter->remoteListener('Test', 'test');
+ $this->emitter->removeListener('Test', 'test');
$this->emitter->emitEvent('Test', 'test');
}
@@ -176,7 +176,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
};
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->listen('Test', 'foo', $listener);
- $this->emitter->remoteListener('Test', null, $listener);
+ $this->emitter->removeListener('Test', null, $listener);
$this->emitter->emitEvent('Test', 'test');
$this->emitter->emitEvent('Test', 'foo');
}
@@ -187,7 +187,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
};
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->listen('Bar', 'test', $listener);
- $this->emitter->remoteListener(null, 'test', $listener);
+ $this->emitter->removeListener(null, 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
$this->emitter->emitEvent('Bar', 'test');
}
@@ -199,7 +199,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->listen('Test', 'foo', $listener);
$this->emitter->listen('Bar', 'foo', $listener);
- $this->emitter->remoteListener(null, null, $listener);
+ $this->emitter->removeListener(null, null, $listener);
$this->emitter->emitEvent('Test', 'test');
$this->emitter->emitEvent('Test', 'foo');
$this->emitter->emitEvent('Bar', 'foo');
@@ -217,7 +217,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
};
$this->emitter->listen('Test', 'test', $listener1);
$this->emitter->listen('Test', 'test', $listener2);
- $this->emitter->remoteListener('Test', 'test', $listener1);
+ $this->emitter->removeListener('Test', 'test', $listener1);
$this->emitter->emitEvent('Test', 'test');
}
@@ -230,7 +230,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
};
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->listen('Test', 'foo', $listener);
- $this->emitter->remoteListener('Test', 'foo', $listener);
+ $this->emitter->removeListener('Test', 'foo', $listener);
$this->emitter->emitEvent('Test', 'test');
}
@@ -243,7 +243,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
};
$this->emitter->listen('Test', 'test', $listener);
$this->emitter->listen('Bar', 'test', $listener);
- $this->emitter->remoteListener('Bar', 'test', $listener);
+ $this->emitter->removeListener('Bar', 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
}
@@ -255,7 +255,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
throw new EmittedException;
};
$this->emitter->listen('Test', 'test', $listener);
- $this->emitter->remoteListener('Bar', 'test', $listener);
+ $this->emitter->removeListener('Bar', 'test', $listener);
$this->emitter->emitEvent('Test', 'test');
}
}
--
GitLab
From 1f464a7113f15ba55c3c80863e315855707f2177 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 9 May 2013 23:21:39 +0200
Subject: [PATCH 154/304] fix for accessing non object
---
lib/public/share.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index cb151b9f4b..17fdd33861 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1249,7 +1249,7 @@ class Share {
, $params
);
// If hook execution didn't encounter errors
- if ( ! $run->run ) {
+ if ( $run !== false && !$run->run ) {
$message = 'Sharing '.$itemSource.' failed, because pre share hooks failed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
return false;
--
GitLab
From 18a821b1e3bd1b688571c7c25bc4b78164a4110d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 9 May 2013 23:22:22 +0200
Subject: [PATCH 155/304] added helper
---
apps/files_encryption/tests/crypt.php | 1 +
apps/files_encryption/tests/keymanager.php | 1 +
2 files changed, 2 insertions(+)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 4a85048ba4..b2dea2f653 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -15,6 +15,7 @@ require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../lib/helper.php' );
require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 33ca29997b..3acc781a09 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -13,6 +13,7 @@ require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../lib/helper.php' );
require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
--
GitLab
From 15845bf0bf2817a2cd113ee1d5752e63cf00bc79 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 9 May 2013 23:22:46 +0200
Subject: [PATCH 156/304] fix for autotest.sh
---
apps/files_encryption/tests/share.php | 40 ++++++++++++---------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index bfe34478f7..5afa44b69c 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -50,20 +50,27 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
OC_Hook::clear('OCP\\Share');
// Sharing related hooks
- OCA\Encryption\Helper::registerShareHooks();
+ \OCA\Encryption\Helper::registerShareHooks();
// Filesystem related hooks
- OCA\Encryption\Helper::registerFilesystemHooks();
+ \OCA\Encryption\Helper::registerFilesystemHooks();
- OC_FileProxy::register( new OCA\Encryption\Proxy() );
+ \OC_FileProxy::register( new OCA\Encryption\Proxy() );
- OC::registerShareHooks();
+ \OC::registerShareHooks();
+
+ OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
// we don't want to tests with app files_trashbin
- OC_App::disable('files_trashbin');
+ \OC_App::disable('files_trashbin');
+
+ $this->loginHelper('user1', true);
+ $this->loginHelper('user2', true);
+ $this->loginHelper('user3', true);
+ $this->loginHelper('user4', true);
}
function tearDown() {
@@ -72,12 +79,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
} else {
OC_App::disable('files_trashbin');
}
+
+ \OC_User::deleteUser('user1');
+ \OC_User::deleteUser('user2');
+ \OC_User::deleteUser('user3');
+ \OC_User::deleteUser('user4');
}
function testShareFile($withTeardown = true) {
- // create user1
- $this->loginHelper('user1', true);
-
// login as admin
$this->loginHelper('admin');
@@ -130,9 +139,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
- // tear down
- \OC_User::deleteUser('user1');
-
// cleanup
$this->view->unlink('/admin/files/'.$filename);
@@ -144,9 +150,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
function testReShareFile($withTeardown = true) {
$this->testShareFile(false);
- // create user2
- $this->loginHelper('user2', true);
-
// login as user1
$this->loginHelper('user1');
@@ -190,10 +193,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
- // tear down
- \OC_User::deleteUser('user2');
- \OC_User::deleteUser('user1');
-
// cleanup
$this->view->unlink('/admin/files/'.$filename);
@@ -204,7 +203,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
function testShareFolder($withTeardown = true) {
// create user1
- $this->loginHelper('user1', true);
+ $this->loginHelper('user1');
// login as admin
$this->loginHelper('admin');
@@ -268,9 +267,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.admin.shareKey'));
-
- // tear down
- \OC_User::deleteUser('user1');
}
}
--
GitLab
From 3eae26143f144cce173a619b260d45605aa11a03 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 10 May 2013 01:00:24 +0200
Subject: [PATCH 157/304] added test for re-share folder
---
apps/files_encryption/tests/share.php | 312 ++++++++++++++++++--------
1 file changed, 215 insertions(+), 97 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 5afa44b69c..ca7209e1af 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,34 +20,46 @@
*
*/
-require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../lib/helper.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+require_once realpath(dirname(__FILE__) . '/../../../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
use OCA\Encryption;
-class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
+class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
+{
+
+ function setUp()
+ {
// reset backend
\OC_User::clearBackends();
\OC_User::useBackend('database');
$this->dataShort = 'hats';
- $this->view = new \OC_FilesystemView( '/' );
+ $this->view = new \OC_FilesystemView('/');
$userHome = \OC_User::getHome('admin');
$this->dataDir = str_replace('/admin', '', $userHome);
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
+
+ $this->filename = 'share-tmp.test';
+
+ // enable resharing
\OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
- OC_Hook::clear('OCP\\Share');
+ // clear share hooks
+ \OC_Hook::clear('OCP\\Share');
+ \OC::registerShareHooks();
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
// Sharing related hooks
\OCA\Encryption\Helper::registerShareHooks();
@@ -55,223 +67,329 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
- \OC_FileProxy::register( new OCA\Encryption\Proxy() );
-
- \OC::registerShareHooks();
-
- OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
- // we don't want to tests with app files_trashbin
+ // we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
+ // create users
$this->loginHelper('user1', true);
$this->loginHelper('user2', true);
$this->loginHelper('user3', true);
- $this->loginHelper('user4', true);
}
-
- function tearDown() {
- if($this->stateFilesTrashbin) {
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
OC_App::enable('files_trashbin');
} else {
OC_App::disable('files_trashbin');
}
+ // cleanup users
\OC_User::deleteUser('user1');
\OC_User::deleteUser('user2');
\OC_User::deleteUser('user3');
- \OC_User::deleteUser('user4');
- }
+ }
- function testShareFile($withTeardown = true) {
+ function testShareFile($withTeardown = true)
+ {
// login as admin
$this->loginHelper('admin');
- $filename = 'share-tmp.test';
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
- // Disable encryption proxy to prevent recursive calls
+ // disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- // get the file infos
- $fileInfo = $this->view->getFileInfo('/admin/files/'.$filename);
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
- // check if we have fileInfos
+ // check if we have a valid file info
$this->assertTrue(is_array($fileInfo));
- // check if we have fileInfos
+ // check if the unencrypted file size is stored
$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+ // re-enable the file proxy
\OC_FileProxy::$enabled = $proxyStatus;
// share the file
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+ // login as admin
$this->loginHelper('admin');
- // check if share key exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
// login as user1
$this->loginHelper('user1');
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $filename);
+ // get file contents
+ $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
- // check if data is the same
+ // check if data is the same as we previously written
$this->assertEquals($this->dataShort, $retreivedCryptedFile);
- if($withTeardown) {
+ // cleanup
+ if ($withTeardown) {
+
// login as admin
$this->loginHelper('admin');
- // share the file
+ // unshare the file
\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
// cleanup
- $this->view->unlink('/admin/files/'.$filename);
+ $this->view->unlink('/admin/files/' . $this->filename);
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.admin.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
}
}
- function testReShareFile($withTeardown = true) {
+ function testReShareFile($withTeardown = true)
+ {
$this->testShareFile(false);
// login as user1
$this->loginHelper('user1');
- $filename = 'share-tmp.test';
-
// get the file info
- $fileInfo = $this->view->getFileInfo('/user1/files/Shared/'.$filename);
+ $fileInfo = $this->view->getFileInfo('/user1/files/Shared/' . $this->filename);
- // share the file
+ // share the file with user2
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+ // login as admin
$this->loginHelper('admin');
- // check if share key exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user2.shareKey'));
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
// login as user2
$this->loginHelper('user2');
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $filename);
+ // get file contents
+ $retreivedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
- // check if data is the same
+ // check if data is the same as previously written
$this->assertEquals($this->dataShort, $retreivedCryptedFile);
- if($withTeardown) {
- // login as admin
+ // cleanup
+ if ($withTeardown) {
+
+ // login as user1
$this->loginHelper('user1');
- // share the file
+ // unshare the file with user2
\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+ // login as admin
$this->loginHelper('admin');
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user2.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
- // share the file
+ // unshare the file with user1
\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
// cleanup
- $this->view->unlink('/admin/files/'.$filename);
+ $this->view->unlink('/admin/files/' . $this->filename);
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/'.$filename.'.admin.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
}
}
- function testShareFolder($withTeardown = true) {
- // create user1
- $this->loginHelper('user1');
-
+ function testShareFolder($withTeardown = true)
+ {
// login as admin
$this->loginHelper('admin');
- $folder1 = '/folder1';
- $subfolder = '/subfolder1';
- $subsubfolder = '/subsubfolder1';
-
- $filename = 'share-tmp.test';
-
- $this->view->mkdir('/admin/files'.$folder1);
- $this->view->mkdir('/admin/files'.$folder1.$subfolder);
- $this->view->mkdir('/admin/files'.$folder1.$subfolder.$subsubfolder);
+ // create folder structure
+ $this->view->mkdir('/admin/files' . $this->folder1);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
- $cryptedFile = file_put_contents( 'crypt://' . $folder1.$subfolder.$subsubfolder.'/'.$filename, $this->dataShort );
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
- // Disable encryption proxy to prevent recursive calls
+ // disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- // get the file infos
- $fileInfo = $this->view->getFileInfo('/admin/files/folder1/');
+ // get the file info from previous created folder
+ $fileInfo = $this->view->getFileInfo('/admin/files' . $this->folder1);
- // check if we have fileInfos
+ // check if we have a valid file info
$this->assertTrue(is_array($fileInfo));
+ // re-enable the file proxy
\OC_FileProxy::$enabled = $proxyStatus;
- // share the file
+ // share the folder with user1
\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+ // login as admin
$this->loginHelper('admin');
- // check if share key exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.user1.shareKey'));
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
// login as user1
$this->loginHelper('user1');
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared'.$folder1.$subfolder.$subsubfolder.'/'.$filename);
+ // get file contents
+ $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if data is the same
$this->assertEquals($this->dataShort, $retreivedCryptedFile);
- if($withTeardown) {
+ // cleanup
+ if ($withTeardown) {
+
// login as admin
$this->loginHelper('admin');
- // share the file
+ // unshare the folder with user1
\OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ }
+
+ return $fileInfo;
+ }
+
+ function testReShareFolder($withTeardown = true)
+ {
+ $fileInfoFolder1 = $this->testShareFolder(false);
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created folder
+ $fileInfoSubFolder = $this->view->getFileInfo('/user1/files/Shared' . $this->folder1 . $this->subfolder);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfoSubFolder));
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file with user2
+ \OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+
+ // login as user2
+ $this->loginHelper('user2');
+
+ // get file contents
+ $retreivedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+
+ // get the file info
+ $fileInfo = $this->view->getFileInfo('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+ // check if we have fileInfos
+ $this->assertTrue(is_array($fileInfo));
+
+ // share the file with user3
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user3 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+
+ // login as user3
+ $this->loginHelper('user3');
+
+ // get file contents
+ $retreivedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
+
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+
+ // cleanup
+ if ($withTeardown) {
+
+ // login as user2
+ $this->loginHelper('user2');
+
+ // unshare the file with user3
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ // unshare the folder with user2
+ \OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the folder1 with user1
+ \OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
// cleanup
- $this->view->unlink('/admin/files'.$folder1.$subfolder.$subsubfolder.'/'.$filename);
+ $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys'.$folder1.$subfolder.$subsubfolder.'/'.$filename.'.admin.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
}
}
- function loginHelper($user, $create=false) {
- if($create) {
+ function loginHelper($user, $create = false)
+ {
+ if ($create) {
\OC_User::createUser($user, $user);
}
--
GitLab
From dc8164a3f09d45b8df195df791fa21ddbd2e510d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 11 May 2013 00:22:58 +0200
Subject: [PATCH 158/304] fix for accessing non object
---
lib/public/share.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index 17fdd33861..418c0028ee 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1243,13 +1243,14 @@ class Share {
'token' => $token,
'run' => $run
);
+
$run = \OC_Hook::emit(
'OCP\Share'
, 'pre_shared'
, $params
);
// If hook execution didn't encounter errors
- if ( $run !== false && !$run->run ) {
+ if ( isset($run->run) && !$run->run ) {
$message = 'Sharing '.$itemSource.' failed, because pre share hooks failed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
return false;
--
GitLab
From e88595638c787e04d1cd6c2df2aabf82ba4729d1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 11 May 2013 00:23:30 +0200
Subject: [PATCH 159/304] fix for webdav
---
apps/files_encryption/lib/proxy.php | 2 +-
apps/files_encryption/lib/stream.php | 2 +-
apps/files_encryption/lib/util.php | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ae36b9fe09..3f8b857125 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -492,7 +492,7 @@ class Proxy extends \OC_FileProxy {
if($fixSize > 0) {
$size = $fixSize;
- $fileInfo['encrypted'] = 1;
+ $fileInfo['encrypted'] = true;
$fileInfo['unencrypted_size'] = $size;
// put file info
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index c2b13b00b2..33b3255e2a 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -519,7 +519,7 @@ class Stream {
}
// set encryption data
- $fileInfo['encrypted'] = 1;
+ $fileInfo['encrypted'] = true;
$fileInfo['size'] = $this->size;
$fileInfo['unencrypted_size'] = $this->unencryptedSize;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 04b1e66f58..ae8c7ffd57 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -94,7 +94,7 @@ class Util {
// Integration testing:
//// TODO: test new encryption with versioning
- //// TODO: test new encryption with sharing
+ //// DONE: test new encryption with sharing
//// TODO: test new encryption with proxies
@@ -533,7 +533,7 @@ class Util {
if ( $realSize > 0 ) {
$cached = $this->view->getFileInfo( $path );
- $cached['encrypted'] = 1;
+ $cached['encrypted'] = true;
// set the size
$cached['unencrypted_size'] = $realSize;
--
GitLab
From 33e0dfeecbcfba7c3caa6765f156cd06d7dfdb13 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 11 May 2013 00:25:32 +0200
Subject: [PATCH 160/304] sharing with group should work now
---
apps/files_encryption/hooks/hooks.php | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e8cd4ade71..619a4d1bfe 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -292,10 +292,16 @@ class Hooks {
foreach ( $allFiles as $path ) {
$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path );
-
- // Because this is a pre_share hook, the user
- // being shared to is not yet included; add them
- $usersSharing[] = $params['shareWith'];
+
+ // check if we share to a group
+ if($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
+ $usersSharing[] = reset(\OC_Group::usersInGroup($params['shareWith']));
+ } else {
+ // Because this is a pre_share hook, the user
+ // being shared to is not yet included; add them
+ $usersSharing[] = $params['shareWith'];
+ }
+
// Attempt to set shareKey
if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
@@ -310,8 +316,7 @@ class Hooks {
// Set flag var 'run' to notify emitting
// script that hook execution failed
$params['run']->run = false;
-
- // TODO: Make sure files_sharing provides user
+ // TODO: Make sure files_sharing provides user
// feedback on failed share
}
--
GitLab
From 8e004cc3e1f2ef14096c8a19771363d29552f5b3 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 11 May 2013 01:03:43 +0200
Subject: [PATCH 161/304] added handling for sharing with link NOTE: only
encryption work atm
---
apps/files_encryption/hooks/hooks.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 619a4d1bfe..2d48198939 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -296,6 +296,9 @@ class Hooks {
// check if we share to a group
if($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
$usersSharing[] = reset(\OC_Group::usersInGroup($params['shareWith']));
+ // check if we share with link
+ } else if($params['shareType'] === \OCP\Share::SHARE_TYPE_LINK) {
+ $usersSharing[] = 'owncloud';
} else {
// Because this is a pre_share hook, the user
// being shared to is not yet included; add them
--
GitLab
From a6ef25ba08e9f026892a2715af479f0ff1299cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 13 May 2013 14:28:45 +0200
Subject: [PATCH 162/304] use preShare hook only to check if all pub keys are
available and the postShare hook to finaly update the shareKeys if the file
was shared successfully
---
apps/files_encryption/hooks/hooks.php | 130 +++++++++++---------------
apps/files_encryption/lib/helper.php | 1 +
apps/files_encryption/lib/proxy.php | 38 --------
3 files changed, 57 insertions(+), 112 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2d48198939..e3890ce1d1 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -179,11 +179,40 @@ class Hooks {
}
}
-
+
+ /*
+ * @brief check if files can be encrypted to every user.
+ */
+ public static function preShared($params) {
+
+ $users = array();
+ $view = new \OC\Files\View('/public-keys/');
+
+ switch ($params['shareType']) {
+ case \OCP\Share::SHARE_TYPE_USER:
+ $users[] = $params['shareWith'];
+ break;
+ case \OCP\Share::SHARE_TYPE_GROUP:
+ $users = \OC_Group::usersInGroup($params['shareWith']);
+ break;
+ }
+
+ foreach ($users as $user) {
+ if (!$view->file_exists($user . '.public.key')) {
+ // Set flag var 'run' to notify emitting
+ // script that hook execution failed
+ $params['run']->run = false;
+ // TODO: Make sure files_sharing provides user
+ // feedback on failed share
+ break;
+ }
+ }
+ }
+
/**
* @brief
*/
- public static function preShared( $params ) {
+ public static function postShared($params) {
// NOTE: $params has keys:
// [itemType] => file
@@ -203,29 +232,28 @@ class Hooks {
// [token] =>
// [run] => whether emitting script should continue to run
// TODO: Should other kinds of item be encrypted too?
-
- if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
- $view = new \OC_FilesystemView( '/' );
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $view = new \OC_FilesystemView('/');
$session = new Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
- $path = $util->fileIdToPath( $params['itemSource'] );
+ $path = $util->fileIdToPath($params['itemSource']);
//if parent is set, then this is a re-share action
- if( $params['parent'] ) {
+ if ($params['parent']) {
// get the parent from current share
- $parent = $util->getShareParent( $params['parent'] );
+ $parent = $util->getShareParent($params['parent']);
// if parent is file the it is an 1:1 share
- if($parent['item_type'] === 'file') {
-
- // prefix path with Shared
- $path = '/Shared'.$parent['file_target'];
+ if ($parent['item_type'] === 'file') {
+ // prefix path with Shared
+ $path = '/Shared' . $parent['file_target'];
} else {
-
+
// NOTE: parent is folder but shared was a file!
// we try to rebuild the missing path
// some examples we face here
@@ -237,38 +265,29 @@ class Hooks {
// so our path should be
// /Shared/subfolder1/subsubfolder1/somefile.txt
// while user3 is sharing
-
- if ( $params['itemType'] === 'file' ) {
+
+ if ($params['itemType'] === 'file') {
// get target path
- $targetPath = $util->fileIdToPath( $params['fileSource'] );
- $targetPathSplit = array_reverse( explode( '/', $targetPath ) );
+ $targetPath = $util->fileIdToPath($params['fileSource']);
+ $targetPathSplit = array_reverse(explode('/', $targetPath));
// init values
$path = '';
- $sharedPart = ltrim( $parent['file_target'], '/' );
+ $sharedPart = ltrim($parent['file_target'], '/');
// rebuild path
- foreach ( $targetPathSplit as $pathPart ) {
-
- if ( $pathPart !== $sharedPart ) {
-
+ foreach ($targetPathSplit as $pathPart) {
+ if ($pathPart !== $sharedPart) {
$path = '/' . $pathPart . $path;
-
} else {
-
break;
-
}
-
}
-
// prefix path with Shared
- $path = '/Shared'.$parent['file_target'].$path;
-
+ $path = '/Shared' . $parent['file_target'] . $path;
} else {
-
// prefix path with Shared
- $path = '/Shared'.$parent['file_target'].$params['fileTarget'];
+ $path = '/Shared' . $parent['file_target'] . $params['fileTarget'];
}
}
}
@@ -276,52 +295,15 @@ class Hooks {
$sharingEnabled = \OCP\Share::isEnabled();
// if a folder was shared, get a list if all (sub-)folders
- if ( $params['itemType'] === 'folder' ) {
-
- $allFiles = $util->getAllFiles( $path );
-
+ if ($params['itemType'] === 'folder') {
+ $allFiles = $util->getAllFiles($path);
} else {
-
- $allFiles = array( $path );
-
+ $allFiles = array($path);
}
-
- // Set array for collecting paths which can't be shared
- $failed = array();
-
- foreach ( $allFiles as $path ) {
-
- $usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path );
- // check if we share to a group
- if($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
- $usersSharing[] = reset(\OC_Group::usersInGroup($params['shareWith']));
- // check if we share with link
- } else if($params['shareType'] === \OCP\Share::SHARE_TYPE_LINK) {
- $usersSharing[] = 'owncloud';
- } else {
- // Because this is a pre_share hook, the user
- // being shared to is not yet included; add them
- $usersSharing[] = $params['shareWith'];
- }
-
-
- // Attempt to set shareKey
- if ( ! $util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
-
- $failed[] = $path;
- }
- }
-
- // If some attempts to set keyfiles failed
- if ( ! empty( $failed ) ) {
-
- // Set flag var 'run' to notify emitting
- // script that hook execution failed
- $params['run']->run = false;
- // TODO: Make sure files_sharing provides user
- // feedback on failed share
-
+ foreach ($allFiles as $path) {
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
+ $util->setSharedFileKeyfiles( $session, $usersSharing, $path );
}
}
}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index b294a71ec1..9b8d9ffc5b 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -35,6 +35,7 @@ class Helper {
public static function registerShareHooks() {
\OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
\OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
\OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 3f8b857125..36d05d7e0f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -164,45 +164,7 @@ class Proxy extends \OC_FileProxy {
return true;
}
-
- public function postFile_put_contents( $path, $length ) {
-
- $userId = \OCP\USER::getUser();
- $view = new \OC_FilesystemView( '/' );
- $util = new Util( $view, $userId );
-
- // Check if recoveryAdmin is enabled for system and user
- // TODO: Consider storing recoveryAdmin status for user in session
- if (
- \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' )
- && $util->recoveryEnabledForUser()
- ) {
-
- // Get owner UID and filepath
- list( $owner, $ownerPath ) = $util->getUidAndFilename( $path );
-
- $recoveryAdminUid = \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
- $usersSharing = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
- // Check if file is already shared to recoveryAdmin
- if ( ! in_array( $recoveryAdminUid, $usersSharing ) ) {
-
- $relPath = $util->stripFilesPath( $path );
-
- // Get file info from filecache
- $fileInfo = \OC\Files\Filesystem::getFileInfo( $path );
-
- // Register share to recoveryAdmin with share API
- // FIXME: Some of these vars aren't set
- // FIXME: What should the permission number be to grant all rights?
-// \OCP\Share::shareItem( $itemType, $itemSource, 0, $recoveryAdminUid, 17 );
-
- }
-
- }
-
- }
-
/**
* @param string $path Path of file from which has been read
* @param string $data Data that has been read from file
--
GitLab
From d1e2e47592515264bf06fc0d48645e430cddc394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 13 May 2013 15:15:35 +0200
Subject: [PATCH 163/304] generate random key name for share key to avoid name
conflicts
---
apps/files_encryption/hooks/hooks.php | 4 +-
apps/files_encryption/lib/session.php | 45 +++++++++++--------
apps/files_encryption/lib/util.php | 9 +++-
lib/public/share.php | 65 ++++++++++++++-------------
4 files changed, 69 insertions(+), 54 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e3890ce1d1..676507b523 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -365,9 +365,9 @@ class Hooks {
$userIds = \OC_Group::usersInGroup($params['shareWith']);
- } else {
+ } else if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_LINK ){
- $userIds = array( $params['shareWith'] );
+ $userIds = array( $util->getPublicShareKeyId() );
}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 22453131db..920f0b6a9a 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -45,10 +45,17 @@ class Session {
$this->view->mkdir( 'owncloud_private_key' );
}
+
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+ if ($publicShareKeyId === null) {
+ $publicShareKeyId = substr(md5(time()),0,8);
+ \OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
+ }
if (
- ! $this->view->file_exists( "/public-keys/owncloud.public.key" )
- || ! $this->view->file_exists( "/owncloud_private_key/owncloud.private.key" )
+ ! $this->view->file_exists( "/public-keys/".$publicShareKeyId.".public.key" )
+ || ! $this->view->file_exists( "/owncloud_private_key/".$publicShareKeyId.".private.key" )
) {
//FIXME: Bug: for some reason file_exists is returning
@@ -57,23 +64,23 @@ class Session {
// our app.php is being executed 18 times per page load
// , causing 18 new keypairs and huge performance hit.
-// $keypair = Crypt::createKeypair();
-//
-// \OC_FileProxy::$enabled = false;
-//
-// // Save public key
-//
-// if (!$view->is_dir('/public-keys')) {
-// $view->mkdir('/public-keys');
-// }
-//
-// $this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] );
-//
-// // Encrypt private key empthy passphrase
-// $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
-//
-// // Save private key
-// $this->view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey );
+ $keypair = Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
+ $this->view->file_put_contents( '/public-keys/'.$publicShareKeyId.'.public.key', $keypair['publicKey'] );
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
+
+ // Save private key
+ $this->view->file_put_contents( '/owncloud_private_key/'.$publicShareKeyId.'.private.key', $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index ae8c7ffd57..8162ae0a36 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -108,6 +108,7 @@ class Util {
private $shareKeysPath; // Dir containing env keys for shared files
private $publicKeyPath; // Path to user's public key
private $privateKeyPath; // Path to user's private key
+ private $publicShareKeyId;
public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
@@ -123,7 +124,7 @@ class Util {
$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-
+ $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
}
public function ready() {
@@ -211,6 +212,10 @@ class Util {
return true;
}
+
+ public function getPublicShareKeyId() {
+ return $this->publicShareKeyId;
+ }
/**
* @brief Check whether pwd recovery is enabled for a given user
@@ -792,7 +797,7 @@ class Util {
// Check that the user is encryption capable, or is the
// public system user 'ownCloud' (for public shares)
if (
- $user == 'owncloud'
+ $user == $this->publicShareKeyId
or $util->ready()
) {
diff --git a/lib/public/share.php b/lib/public/share.php
index 418c0028ee..b9cf05bbf7 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -133,17 +133,17 @@ class Share {
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $path, $user, $includeOwner = false, $removeDuplicates = true ) {
+ public static function getUsersSharingFile($path, $user, $includeOwner = false, $removeDuplicates = true) {
$path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
$path = '';
$shares = array();
- $view = new \OC\Files\View('/'.$user.'/files/');
+ $view = new \OC\Files\View('/' . $user . '/files/');
foreach ($path_parts as $p) {
- $path .= '/'.$p;
+ $path .= '/' . $p;
$meta = $view->getFileInfo(\OC_Filesystem::normalizePath($path));
$source = $meta['fileid'];
-
+
// Fetch all shares of this file path from DB
$query = \OC_DB::prepare(
'SELECT share_with
@@ -152,14 +152,14 @@ class Share {
WHERE
item_source = ? AND share_type = ?'
);
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_USER ) );
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ $result = $query->execute(array($source, self::SHARE_TYPE_USER));
+
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
}
- while( $row = $result->fetchRow() ) {
+ while ($row = $result->fetchRow()) {
$shares[] = $row['share_with'];
}
@@ -172,44 +172,47 @@ class Share {
WHERE
item_source = ? AND share_type = ?'
);
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP ) );
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ $result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
+
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
}
- while( $row = $result->fetchRow() ) {
+ while ($row = $result->fetchRow()) {
$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
$shares = array_merge($shares, $usersInGroup);
}
-
- //check for public link shares
- $query = \OC_DB::prepare(
- 'SELECT share_with
+
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+ if ($publicShareKeyId) {
+ //check for public link shares
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
FROM
`*PREFIX*share`
WHERE
item_source = ? AND share_type = ?'
- );
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_LINK ) );
-
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
- }
-
- if ($result->fetchRow()) {
- $shares[] = "owncloud";
+ );
+
+ $result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+ }
+
+ if ($result->fetchRow()) {
+ $shares[] = $publicShareKeyId;
+ }
}
}
// Include owner in list of users, if requested
- if ( $includeOwner ) {
+ if ($includeOwner) {
$shares[] = $user;
}
-
- return array_unique($shares);
+ return array_unique($shares);
}
/**
--
GitLab
From 2f4ba9d1e8ca6406abb509ad82869cfb6aca40c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 13 May 2013 15:45:30 +0200
Subject: [PATCH 164/304] if file was shared to user than userIds is just the
users Id
---
apps/files_encryption/hooks/hooks.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 676507b523..71a0fc9268 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -362,13 +362,11 @@ class Hooks {
// for group shares get a list of the group members
if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP ) {
-
$userIds = \OC_Group::usersInGroup($params['shareWith']);
-
} else if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_LINK ){
-
$userIds = array( $util->getPublicShareKeyId() );
-
+ } else {
+ $userIds = array( $params['shareWith'] );
}
// if we unshare a folder we need a list of all (sub-)files
--
GitLab
From 71eed76dbef92363d5f6eeb423496c6b8dac0579 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 13 May 2013 11:17:08 -0400
Subject: [PATCH 165/304] Prevent backgroundScan() from looping if opendir() is
failing for the same path
---
lib/files/cache/scanner.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 661bc48633..b99dea23cb 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -179,9 +179,11 @@ class Scanner {
* walk over any folders that are not fully scanned yet and scan them
*/
public function backgroundScan() {
- while (($path = $this->cache->getIncomplete()) !== false) {
+ $lastPath = null;
+ while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
$this->scan($path);
$this->cache->correctFolderSize($path);
+ $lastPath = $path;
}
}
}
--
GitLab
From 517efdf952526ce0f0a03107874baca18742c49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 13 May 2013 17:26:21 +0200
Subject: [PATCH 166/304] don't create a recovery user, only generate recovery
key similar to the public link share key
---
apps/files_encryption/ajax/adminrecovery.php | 122 ++++++++----------
apps/files_encryption/js/settings-admin.js | 9 +-
apps/files_encryption/lib/session.php | 10 +-
apps/files_encryption/lib/util.php | 4 +-
.../templates/settings-admin.php | 17 +--
5 files changed, 63 insertions(+), 99 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index c3c19943c0..6a056dc7b3 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
@@ -6,87 +7,78 @@
*
* @brief Script to handle admin settings for encrypted key recovery
*/
-
use OCA\Encryption;
\OCP\JSON::checkAdminUser();
-\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::checkAppEnabled('files_encryption');
\OCP\JSON::callCheck();
-$return = $doSetup = false;
+$return = false;
// Enable recoveryAdmin
-if (
- isset( $_POST['adminEnableRecovery'] )
- && 1 == $_POST['adminEnableRecovery']
-// && isset( $_POST['recoveryPassword'] )
-// && ! empty ( $_POST['recoveryPassword'] )
+
+if (
+ isset($_POST['adminEnableRecovery'])
+ && 1 == $_POST['adminEnableRecovery']
) {
- // TODO: Let the admin set this themselves
- $recoveryAdminUid = 'recoveryAdmin';
-
- // If desired recoveryAdmin UID is already in use
- if ( ! \OC_User::userExists( $recoveryAdminUid ) ) {
-
- // Create new recoveryAdmin user
- \OC_User::createUser( $recoveryAdminUid, $_POST['recoveryPassword'] );
-
- // Make recovery user an administrator
- \OC_Group::addToGroup ( $recoveryAdminUid, 'admin' );
-
- $doSetup = true;
-
- } else {
-
- // Get list of admin users
- $admins = OC_Group::usersInGroup( 'admin' );
-
- // If the existing recoveryAdmin UID is an admin
- if ( in_array( $recoveryAdminUid, $admins ) ) {
-
- // The desired recoveryAdmi UID pre-exists and can be used
- $doSetup = true;
-
- // If the recoveryAdmin UID exists but doesn't have admin rights
- } else {
-
- $return = false;
-
- }
-
+ $view = new \OC\Files\View('/');
+
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ if ($recoveryKeyId === null) {
+ $recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
+ \OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
}
-
- // Setup recoveryAdmin user for encryption
- if ( $doSetup ) {
-
- $view = new \OC_FilesystemView( '/' );
- $util = new \OCA\Encryption\Util( $view, $recoveryAdminUid );
-
- // Ensure recoveryAdmin is ready for encryption (has usable keypair etc.)
- $util->setupServerSide( $_POST['recoveryPassword'] );
-
- // Store the UID in the DB
- OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminUid', $recoveryAdminUid );
-
- $return = true;
-
+
+ if (!$view->is_dir('/owncloud_private_key')) {
+ $view->mkdir('/owncloud_private_key');
}
-
+
+ if (
+ (!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
+ || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
+ && isset($_POST['recoveryPassword'])
+ && !empty($_POST['recoveryPassword'])
+ ) {
+
+ $keypair = \OCA\Encryption\Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
+ $view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $_POST['recoveryPassword']);
+
+ // Save private key
+ $view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
+
+ \OC_FileProxy::$enabled = true;
+
+ }
+
// Set recoveryAdmin as enabled
- OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
+ OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+
+ $return = true;
// Disable recoveryAdmin
-} elseif (
- isset( $_POST['adminEnableRecovery'] )
- && 0 == $_POST['adminEnableRecovery']
+} elseif (
+ isset($_POST['adminEnableRecovery'])
+ && 0 == $_POST['adminEnableRecovery']
) {
-
- // Set recoveryAdmin as enabled
- OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 0 );
-
- $return = true;
+ // Set recoveryAdmin as enabled
+ OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
+
+ $return = true;
}
// Return success or failure
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 8e9c8c2230..9cdb7aca68 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -7,13 +7,6 @@
$(document).ready(function(){
- // Trigger ajax on filetype blacklist change
- $('#encryption_blacklist').multiSelect({
- oncheck:blackListChange,
- onuncheck:blackListChange,
- createText:'...'
- });
-
// Trigger ajax on recoveryAdmin status change
$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
@@ -24,7 +17,7 @@ $(document).ready(function(){
if ( '' == recoveryPassword ) {
// FIXME: add proper OC notification
- alert( 'You must set a recovery account password first' );
+ alert( 'You must set a recovery account password first' );
} else {
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 920f0b6a9a..5444d0215c 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -49,7 +49,7 @@ class Session {
$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
if ($publicShareKeyId === null) {
- $publicShareKeyId = substr(md5(time()),0,8);
+ $publicShareKeyId = 'pubShare_'.substr(md5(time()),0,8);
\OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
}
@@ -57,13 +57,7 @@ class Session {
! $this->view->file_exists( "/public-keys/".$publicShareKeyId.".public.key" )
|| ! $this->view->file_exists( "/owncloud_private_key/".$publicShareKeyId.".private.key" )
) {
-
- //FIXME: Bug: for some reason file_exists is returning
- // false in above if statement, and causing new keys
- // to be generated on each page load. At last check
- // our app.php is being executed 18 times per page load
- // , causing 18 new keypairs and huge performance hit.
-
+
$keypair = Crypt::createKeypair();
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8162ae0a36..732f5fece8 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -958,10 +958,10 @@ class Util {
if ( $recoveryEnabled ) {
// Find recoveryAdmin user ID
- $recoveryAdminUid = \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminUid' );
+ $recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
// Add recoveryAdmin to list of users sharing
- $userIds[] = $recoveryAdminUid;
+ $userIds[] = $recoveryKeyId;
}
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 863f1dfa9a..be7beecf69 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -4,25 +4,10 @@
<p>
<strong><?php p($l->t( 'Encryption' )); ?></strong>
<br />
-
- <?php p($l->t( "Exclude the following file types from encryption:" )); ?>
- <br />
-
- <select
- id='encryption_blacklist'
- title="<?php p($l->t( 'None' ))?>"
- multiple="multiple">
- <?php foreach($_["blacklist"] as $type): ?>
- <option selected="selected" value="<?php p($type); ?>"> <?php p($type); ?> </option>
- <?php endforeach;?>
- </select>
</p>
<p>
- <strong>
- <?php p($l->t( "Enable encryption passwords recovery account (allow sharing to recovery account):" )); ?>
+ <?php p($l->t( "Enable encryption passwords recovery key (allow sharing to recovery key):" )); ?>
<br />
- </strong>
- <?php p($l->t( "To perform a recovery log in using the 'recoveryAdmin' account and the specified password" )); ?>
<br />
<?php if ( empty( $_['recoveryAdminUid'] ) ): ?>
<input type="password" name="recoveryPassword" id="recoveryPassword" />
--
GitLab
From aa3eb6bb5be9979c31f402201241cf127573541e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 13 May 2013 17:40:57 +0200
Subject: [PATCH 167/304] don't handle public share keys in
lib/public/share.php but in apps/files_encryption/lib/util.php instead
---
apps/files_encryption/lib/util.php | 9 ++++++++-
lib/public/share.php | 27 ++++++++++++---------------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 732f5fece8..2a64680599 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -109,6 +109,7 @@ class Util {
private $publicKeyPath; // Path to user's public key
private $privateKeyPath; // Path to user's private key
private $publicShareKeyId;
+ private $recoveryKeyId;
public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
@@ -125,6 +126,7 @@ class Util {
$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
$this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+ $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
}
public function ready() {
@@ -798,6 +800,7 @@ class Util {
// public system user 'ownCloud' (for public shares)
if (
$user == $this->publicShareKeyId
+ or $user == $this->recoveryKeyId
or $util->ready()
) {
@@ -949,7 +952,11 @@ class Util {
if ( $sharingEnabled ) {
// Find out who, if anyone, is sharing the file
- $userIds = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
+ $result = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
+ $userIds = $result['users'];
+ if ( $result['public'] ) {
+ $userIds[] = $this->publicShareKeyId;
+ }
}
diff --git a/lib/public/share.php b/lib/public/share.php
index b9cf05bbf7..10400e34c5 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -138,6 +138,7 @@ class Share {
$path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
$path = '';
$shares = array();
+ $publicShare = false;
$view = new \OC\Files\View('/' . $user . '/files/');
foreach ($path_parts as $p) {
$path .= '/' . $p;
@@ -184,27 +185,23 @@ class Share {
$shares = array_merge($shares, $usersInGroup);
}
- $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
-
- if ($publicShareKeyId) {
- //check for public link shares
- $query = \OC_DB::prepare(
- 'SELECT share_with
+ //check for public link shares
+ $query = \OC_DB::prepare(
+ 'SELECT share_with
FROM
`*PREFIX*share`
WHERE
item_source = ? AND share_type = ?'
- );
+ );
- $result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+ $result = $query->execute(array($source, self::SHARE_TYPE_LINK));
- if (\OC_DB::isError($result)) {
- \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
- }
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+ }
- if ($result->fetchRow()) {
- $shares[] = $publicShareKeyId;
- }
+ if ($result->fetchRow()) {
+ $publicShare = true;
}
}
// Include owner in list of users, if requested
@@ -212,7 +209,7 @@ class Share {
$shares[] = $user;
}
- return array_unique($shares);
+ return array("users" => array_unique($shares), "public" => $publicShare);
}
/**
--
GitLab
From d92f6b887d99a24b2bda1503f328c698c682d60e Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 13 May 2013 21:22:59 +0200
Subject: [PATCH 168/304] removed var_dump
---
apps/files_encryption/tests/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index d0a988f96b..efd3f03bc6 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -172,7 +172,7 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$files = $util->findEncFiles( '/', 'encrypted' );
- var_dump( $files );
+ //var_dump( $files );
# TODO: Add more tests here to check that if any of the dirs are
# then false will be returned. Use strict ordering?
--
GitLab
From 61ed347d26872bc62465be4df595da3391ea84bb Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 13 May 2013 21:24:59 +0200
Subject: [PATCH 169/304] added handling for public file access via
files_sharing link
---
apps/files_encryption/lib/keymanager.php | 2 +-
apps/files_encryption/lib/session.php | 22 +++-
apps/files_encryption/lib/stream.php | 16 +--
apps/files_encryption/lib/util.php | 144 +++++++++++++++--------
4 files changed, 120 insertions(+), 64 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 6c2df6f840..8ee7820b16 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -455,7 +455,7 @@ class Keymanager {
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
if ( $view->file_exists( $shareKeyPath ) ) {
$result = $view->file_get_contents( $shareKeyPath );
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 5444d0215c..f02315f95d 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -59,9 +59,11 @@ class Session {
) {
$keypair = Crypt::createKeypair();
-
- \OC_FileProxy::$enabled = false;
-
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
// Save public key
if (!$view->is_dir('/public-keys')) {
@@ -76,9 +78,21 @@ class Session {
// Save private key
$this->view->file_put_contents( '/owncloud_private_key/'.$publicShareKeyId.'.private.key', $encryptedPrivateKey );
- \OC_FileProxy::$enabled = true;
+ \OC_FileProxy::$enabled = $proxyStatus;
}
+
+ if(\OCP\USER::getUser() === false) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/'.$publicShareKeyId.'.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
+ $this->setPrivateKey($privateKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
/**
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 33b3255e2a..3149b460b6 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -72,20 +72,20 @@ class Stream {
private $rootView; // a fsview object set to '/'
public function stream_open( $path, $mode, $options, &$opened_path ) {
-
- $this->userId = \OCP\User::getUser();
-
- if ( ! isset( $this->rootView ) ) {
+ if ( ! isset( $this->rootView ) ) {
$this->rootView = new \OC_FilesystemView( '/' );
-
}
- // Strip identifier text from path, this gives us the path relative to data/<user>/files
- $this->relPath = str_replace( 'crypt://', '', $path );
+ $util = new Util( $this->rootView, \OCP\USER::getUser());
+
+ $this->userId = $util->getUserId();
+
+ // Strip identifier text from path, this gives us the path relative to data/<user>/files
+ $this->relPath = \OC\Files\Filesystem::normalizePath(str_replace( 'crypt://', '', $path ));
// rawPath is relative to the data directory
- $this->rawPath = $this->userId . '/files/' . $this->relPath;
+ $this->rawPath = $util->getUserFilesDir() . $this->relPath;
if (
dirname( $this->rawPath ) == 'streams'
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2a64680599..213bbd1d21 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -110,23 +110,47 @@ class Util {
private $privateKeyPath; // Path to user's private key
private $publicShareKeyId;
private $recoveryKeyId;
+ private $isPublic;
public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
-
+
$this->view = $view;
$this->userId = $userId;
$this->client = $client;
- $this->userDir = '/' . $this->userId;
- $this->fileFolderName = 'files';
- $this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
- $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
- $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+ $this->isPublic = false;
+
+ $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+ $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // if we are anonymous/public
+ if($this->userId === false) {
+ $this->userId = $this->publicShareKeyId;
+
+ // only handle for files_sharing app
+ if($GLOBALS['app'] === 'files_sharing') {
+ $this->userDir = '/' . $GLOBALS['fileOwner'];
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ $this->isPublic = true;
+ }
+
+ } else {
+ $this->userDir = '/' . $this->userId;
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ }
}
public function ready() {
@@ -1069,46 +1093,54 @@ class Util {
$view = new \OC\Files\View($this->userFilesDir);
$fileOwnerUid = $view->getOwner( $path );
-
- // Check that UID is valid
- if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
-
- throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
-
- }
- // NOTE: Bah, this dependency should be elsewhere
- \OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
-
- // If the file owner is the currently logged in user
- if ( $fileOwnerUid == $this->userId ) {
-
- // Assume the path supplied is correct
- $filename = $path;
-
- } else {
-
- $info = $view->getFileInfo( $path );
- $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
-
- // Fetch real file path from DB
- $filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
-
- }
-
- // Make path relative for use by $view
- $relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename);
-
- // Check that the filename we're using is working
- if ( $this->view->file_exists( $relpath ) ) {
-
- return array ( $fileOwnerUid, $filename );
-
- } else {
-
- return false;
-
- }
+ // handle public access
+ if($fileOwnerUid === false && $this->isPublic) {
+ $filename = $view->getPath( $GLOBALS['fileSource'] );
+ $fileOwnerUid = $GLOBALS['fileOwner'];
+
+ return array ( $fileOwnerUid, $filename );
+ } else {
+
+ // Check that UID is valid
+ if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
+ throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
+ }
+
+ // NOTE: Bah, this dependency should be elsewhere
+ \OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
+
+ // If the file owner is the currently logged in user
+ if ( $fileOwnerUid == $this->userId ) {
+
+ // Assume the path supplied is correct
+ $filename = $path;
+
+ } else {
+
+ $info = $view->getFileInfo( $path );
+ $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
+
+ // Fetch real file path from DB
+ $filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
+
+ }
+
+ // Make path relative for use by $view
+ $relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename);
+
+ // Check that the filename we're using is working
+ if ( $this->view->file_exists( $relpath ) ) {
+
+ return array ( $fileOwnerUid, $filename );
+
+ } else {
+
+ return false;
+
+ }
+ }
+
}
@@ -1233,4 +1265,14 @@ class Util {
}
+ public function getUserId()
+ {
+ return $this->userId;
+ }
+
+ public function getUserFilesDir()
+ {
+ return $this->userFilesDir;
+ }
+
}
--
GitLab
From b2d021b2a5a603505c6c0e607472ee4e91962afe Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 13 May 2013 22:34:11 +0200
Subject: [PATCH 170/304] added post_createUser hook
---
apps/files_encryption/hooks/hooks.php | 30 ++++++++++++++++-----------
apps/files_encryption/lib/helper.php | 20 ++++++++++++++++++
2 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 71a0fc9268..ebaa9c5145 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -47,17 +47,11 @@ class Hooks {
$view = new \OC_FilesystemView( '/' );
$util = new Util( $view, $params['uid'] );
-
- // Check files_encryption infrastructure is ready for action
- if ( ! $util->ready() ) {
-
- \OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
-
- if(!$util->setupServerSide( $params['password'] )) {
- return false;
- }
- }
+ // setup user, if user not ready force relogin
+ if(Helper::setupUser($util, $params['password']) === false) {
+ return false;
+ }
\OC_FileProxy::$enabled = false;
@@ -120,8 +114,20 @@ class Hooks {
return true;
}
-
- /**
+
+ /**
+ * @brief setup encryption backend upon user created
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function postCreateUser( $params ) {
+ $view = new \OC_FilesystemView( '/' );
+
+ $util = new Util( $view, $params['uid'] );
+
+ Helper::setupUser($util, $params['password']);
+ }
+
+ /**
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 9b8d9ffc5b..3a5b2f78ce 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -48,6 +48,7 @@ class Helper {
\OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
\OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+ \OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
}
/**
@@ -68,5 +69,24 @@ class Helper {
\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
}
+ /**
+ * @brief setup user for files_encryption
+ *
+ * @param Util $util
+ * @param string $password
+ * @return bool
+ */
+ public static function setupUser($util, $password) {
+ // Check files_encryption infrastructure is ready for action
+ if ( ! $util->ready() ) {
+ \OC_Log::write( 'Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
+
+ if(!$util->setupServerSide( $password )) {
+ return false;
+ }
+ }
+
+ return true;
+ }
}
\ No newline at end of file
--
GitLab
From a4e9e2fc792f6300d93febd83a8b826c80bbcdc1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 13 May 2013 22:49:27 +0200
Subject: [PATCH 171/304] added post_deleteUser hook for cleanup public key
---
apps/files_encryption/hooks/hooks.php | 19 +++++++++++++++++++
apps/files_encryption/lib/helper.php | 1 +
2 files changed, 20 insertions(+)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index ebaa9c5145..134b038e7e 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -127,6 +127,25 @@ class Hooks {
Helper::setupUser($util, $params['password']);
}
+ /**
+ * @brief cleanup encryption backend upon user deleted
+ * @note This method should never be called for users using client side encryption
+ */
+ public static function postDeleteUser( $params ) {
+ $view = new \OC_FilesystemView( '/' );
+
+ // cleanup public key
+ $publicKey = '/public-keys/' . $params['uid'] . '.public.key';
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view->unlink($publicKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
/**
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 3a5b2f78ce..783cebeee5 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -49,6 +49,7 @@ class Helper {
\OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
\OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
\OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
+ \OCP\Util::connectHook( 'OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser' );
}
/**
--
GitLab
From 81ae4cb5d07c1a7bf40a283bdb7e52c33dc243c6 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 14 May 2013 00:00:20 +0200
Subject: [PATCH 172/304] added test for public shared file via link
---
apps/files_encryption/lib/util.php | 2 +-
apps/files_encryption/tests/share.php | 88 ++++++++++++++++++++++++---
2 files changed, 79 insertions(+), 11 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 213bbd1d21..8f20481db6 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1096,7 +1096,7 @@ class Util {
// handle public access
if($fileOwnerUid === false && $this->isPublic) {
- $filename = $view->getPath( $GLOBALS['fileSource'] );
+ $filename = $this->fileIdToPath( $GLOBALS['fileSource'] );
$fileOwnerUid = $GLOBALS['fileOwner'];
return array ( $fileOwnerUid, $filename );
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index ca7209e1af..850985c9f9 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -136,10 +136,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->loginHelper('user1');
// get file contents
- $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
+ $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
// check if data is the same as we previously written
- $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
// cleanup
if ($withTeardown) {
@@ -184,10 +184,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->loginHelper('user2');
// get file contents
- $retreivedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
// check if data is the same as previously written
- $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
// cleanup
if ($withTeardown) {
@@ -260,10 +260,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->loginHelper('user1');
// get file contents
- $retreivedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if data is the same
- $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
// cleanup
if ($withTeardown) {
@@ -320,10 +320,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->loginHelper('user2');
// get file contents
- $retreivedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if data is the same
- $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
// get the file info
$fileInfo = $this->view->getFileInfo('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
@@ -344,10 +344,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->loginHelper('user3');
// get file contents
- $retreivedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
+ $retrievedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
// check if data is the same
- $this->assertEquals($this->dataShort, $retreivedCryptedFile);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
// cleanup
if ($withTeardown) {
@@ -387,6 +387,74 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
}
}
+ function testPublicShareFile()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, false);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+ // check if share key for public exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+ // some hacking to simulate public link
+ $GLOBALS['app'] = 'files_sharing';
+ $GLOBALS['fileOwner'] = 'admin';
+ $GLOBALS['fileSource'] = $fileInfo['fileid'];
+ \OC_User::setUserId('');
+
+ // get file contents
+ $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // tear down
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
+
function loginHelper($user, $create = false)
{
if ($create) {
--
GitLab
From 517105660d334b21b2e4b83d4c00704d9a5d275d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 14 May 2013 20:11:07 +0200
Subject: [PATCH 173/304] fix for public link share
---
apps/files_encryption/lib/util.php | 2 +-
apps/files_encryption/tests/share.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8f20481db6..0233804160 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1096,7 +1096,7 @@ class Util {
// handle public access
if($fileOwnerUid === false && $this->isPublic) {
- $filename = $this->fileIdToPath( $GLOBALS['fileSource'] );
+ $filename = $path;
$fileOwnerUid = $GLOBALS['fileOwner'];
return array ( $fileOwnerUid, $filename );
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 850985c9f9..b8433821d3 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -428,7 +428,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// some hacking to simulate public link
$GLOBALS['app'] = 'files_sharing';
$GLOBALS['fileOwner'] = 'admin';
- $GLOBALS['fileSource'] = $fileInfo['fileid'];
\OC_User::setUserId('');
// get file contents
--
GitLab
From 84c56a5d56eddfb9e5d0356575902253eb266da1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 14 May 2013 21:29:24 +0200
Subject: [PATCH 174/304] fix for zero size files
---
apps/files_encryption/lib/stream.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 3149b460b6..db7d2ad617 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -477,9 +477,9 @@ class Stream {
if (
$this->meta['mode']!='r'
- and $this->meta['mode']!='rb'
+ and $this->meta['mode']!='rb'
+ and $this->size > 0
) {
-
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
--
GitLab
From 0a7aa6e8cdbf96c3a54ea0a897eb5dfb8cd37c01 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 14 May 2013 22:32:39 +0200
Subject: [PATCH 175/304] fix for Allowed memory size of xx bytes exhausted
while reading big files
---
apps/files_encryption/lib/util.php | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 0233804160..19c9cd72a1 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -480,13 +480,20 @@ class Util {
*/
public function isEncryptedPath( $path ) {
- // Disable encryption proxy so data retreived is in its
+ // Disable encryption proxy so data retrieved is in its
// original form
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- $data = $this->view->file_get_contents( $path );
-
- \OC_FileProxy::$enabled = true;
+
+ // we only need 24 byte from the last chunk
+ $data = '';
+ $handle = $this->view->fopen( $path, 'r' );
+ if(!fseek($handle, -24, SEEK_END)) {
+ $data = fgets($handle);
+ }
+
+ // re-enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
return Crypt::isCatfileContent( $data );
--
GitLab
From 87760007549cb1573a431784ace24ffa300d8d90 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 14 May 2013 23:19:16 +0200
Subject: [PATCH 176/304] fix for move file to an empty folder
---
apps/files_encryption/hooks/hooks.php | 28 ++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 134b038e7e..31175d1c34 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -462,8 +462,8 @@ class Hooks {
$util = new Util( $view, $userId );
// Format paths to be relative to user files dir
- $oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath'];
- $newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath'];
+ $oldKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
+ $newKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
// add key ext if this is not an folder
if (!$view->is_dir($oldKeyfilePath)) {
@@ -474,19 +474,37 @@ class Hooks {
$localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$params['oldpath']);
$matches = glob(preg_quote($localKeyPath).'*.shareKey');
foreach ($matches as $src) {
- $dst = str_replace($params['oldpath'], $params['newpath'], $src);
+ $dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));
+
+ // create destination folder if not exists
+ if(!file_exists(dirname($dst))) {
+ mkdir(dirname($dst), 0750, true);
+ }
+
rename($src, $dst);
}
} else {
// handle share-keys folders
- $oldShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath'];
- $newShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath'];
+ $oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
+ $newShareKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
+
+ // create destination folder if not exists
+ if(!$view->file_exists(dirname($newShareKeyfilePath))) {
+ $view->mkdir(dirname($newShareKeyfilePath), 0750, true);
+ }
+
$view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
}
// Rename keyfile so it isn't orphaned
if($view->file_exists($oldKeyfilePath)) {
+
+ // create destination folder if not exists
+ if(!$view->file_exists(dirname($newKeyfilePath))) {
+ $view->mkdir(dirname($newKeyfilePath), 0750, true);
+ }
+
$view->rename($oldKeyfilePath, $newKeyfilePath);
}
--
GitLab
From 791751b5299b59a0c8bc5bc5dbdaf1528543d1c1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 02:32:27 +0200
Subject: [PATCH 177/304] added setter for filesystem view this is needed
because there is no possibility to set $defaultInstance to false after
filesystem::init
---
lib/files/filesystem.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index c0e9d215fb..df904e1f27 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -210,7 +210,7 @@ class Filesystem {
return true;
}
- /**
+ /**
* Initialize system and personal mount points for a user
*
* @param string $user
@@ -306,6 +306,14 @@ class Filesystem {
return self::$defaultInstance;
}
+ /**
+ * set the default filesystem view
+ *
+ */
+ static public function setView($view) {
+ self::$defaultInstance = $view;
+ }
+
/**
* tear down the filesystem, removing all storage providers
*/
--
GitLab
From ddedf201062c99f4dfce64b2dde8c912d8305491 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 02:34:36 +0200
Subject: [PATCH 178/304] prevent of infinite loop with FileProxy
---
apps/files_encryption/lib/stream.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index db7d2ad617..ab96783508 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -509,15 +509,15 @@ class Stream {
// Save the sharekeys
Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
-
// get file info
$fileInfo = $view->getFileInfo($this->rawPath);
if(!is_array($fileInfo)) {
$fileInfo = array();
}
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+
// set encryption data
$fileInfo['encrypted'] = true;
$fileInfo['size'] = $this->size;
--
GitLab
From 499fe6ca8e28d559ad8aba7724766c111c65290a Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 02:36:23 +0200
Subject: [PATCH 179/304] disabled FileProxy in Keymanager::getPrivateKey
---
apps/files_encryption/lib/keymanager.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 8ee7820b16..74462a0d1e 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -38,9 +38,14 @@ class Keymanager {
public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
$path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
$key = $view->file_get_contents( $path );
-
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
return $key;
}
--
GitLab
From 7461e9c2b5bdabd0b712f91a22445a0d933cf88f Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 02:38:08 +0200
Subject: [PATCH 180/304] improved tests and added new tests for file rename
and move
---
apps/files_encryption/tests/crypt.php | 105 +++++++++++++++++----
apps/files_encryption/tests/keymanager.php | 25 +++--
apps/files_encryption/tests/share.php | 1 +
apps/files_encryption/tests/util.php | 18 +++-
4 files changed, 117 insertions(+), 32 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index b2dea2f653..de7ae38b17 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -35,6 +35,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
function setUp() {
// reset backend
+ \OC_User::clearBackends();
\OC_User::useBackend('database');
// set content for encrypting / decrypting in tests
@@ -58,17 +59,26 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/'.$this->userId, '', $userHome);
- \OC\Files\Filesystem::init($this->userId, '/');
- \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::setView(false);
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
+
}
function tearDown() {
- }
+ }
function testGenerateKey() {
@@ -272,7 +282,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataShort, $manualDecrypt );
// Teardown
- $this->view->unlink( $filename );
+ $this->view->unlink( $this->userId . '/files/' . $filename );
Encryption\Keymanager::deleteFileKey( $this->view, $this->userId, $filename );
}
@@ -350,7 +360,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Teardown
- $this->view->unlink( $filename );
+ $this->view->unlink( $this->userId . '/files/' . $filename );
Encryption\Keymanager::deleteFileKey( $this->view, $this->userId, $filename );
@@ -368,15 +378,14 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
- $decrypt = file_get_contents( 'crypt://' . $filename );
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents( 'crypt://' . $filename );
$this->assertEquals( $this->dataShort, $decrypt );
-
+
+ // tear down
+ $this->view->unlink( $this->userId . '/files/' . $filename );
}
function testSymmetricStreamDecryptLongFileContent() {
@@ -388,15 +397,14 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
-
-
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-
+
+ // Get file decrypted contents
$decrypt = file_get_contents( 'crypt://' . $filename );
-
+
$this->assertEquals( $this->dataLong, $decrypt );
-
+
+ // tear down
+ $this->view->unlink( $this->userId . '/files/' . $filename );
}
// Is this test still necessary?
@@ -623,6 +631,65 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
}
+ function testRenameFile() {
+
+ $filename = 'tmp-'.time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents( 'crypt://' . $filename );
+
+ $this->assertEquals( $this->dataLong, $decrypt );
+
+ $newFilename = 'tmp-new-'.time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->rename( $filename, $newFilename );
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents( 'crypt://' . $newFilename );
+
+ $this->assertEquals( $this->dataLong, $newDecrypt );
+
+ // tear down
+ $view->unlink( $newFilename );
+ }
+
+ function testMoveFileIntoFolder() {
+
+ $filename = 'tmp-'.time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents( 'crypt://' . $filename );
+
+ $this->assertEquals( $this->dataLong, $decrypt );
+
+ $newFolder = '/newfolder1';
+ $newFilename = 'tmp-new-'.time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->mkdir($newFolder);
+ $view->rename( $filename, $newFolder . '/' . $newFilename );
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents( 'crypt://' . $newFolder . '/' . $newFilename );
+
+ $this->assertEquals( $this->dataLong, $newDecrypt );
+
+ // tear down
+ $view->unlink( $newFolder . '/' . $newFilename );
+ $view->unlink( $newFolder );
+ }
+
// function testEncryption(){
//
// $key=uniqid();
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 3acc781a09..d24dcaa036 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -26,6 +26,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
function setUp() {
// reset backend
+ \OC_User::clearBackends();
\OC_User::useBackend('database');
\OC_FileProxy::$enabled = false;
@@ -41,18 +42,26 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
$keypair = Encryption\Crypt::createKeypair();
$this->genPublicKey = $keypair['publicKey'];
$this->genPrivateKey = $keypair['privateKey'];
-
- $this->view = new \OC_FilesystemView( '/' );
-
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
+
+ $this->view = new \OC_FilesystemView( '/' );
+
+ \OC_User::setUserId( 'admin' );
+ $this->userId = 'admin';
+ $this->pass = 'admin';
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/'.$this->userId, '', $userHome);
- \OC\Files\Filesystem::init( $this->userId, '/' );
- \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::setView(false);
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index b8433821d3..e2e26aa75b 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -462,6 +462,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
\OC_Util::tearDownFS();
\OC_User::setUserId('');
+ \OC\Files\Filesystem::setView(false);
\OC_Util::setupFS($user);
\OC_User::setUserId($user);
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index efd3f03bc6..2abf409690 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -51,14 +51,22 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-
- $this->view = new \OC_FilesystemView( '/' );
+
+ $this->view = new \OC_FilesystemView( '/' );
$userHome = \OC_User::getHome($this->userId);
$this->dataDir = str_replace('/'.$this->userId, '', $userHome);
- \OC\Files\Filesystem::init( $this->userId, '/' );
- \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::setView(false);
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
$params['uid'] = $this->userId;
$params['password'] = $this->pass;
@@ -170,7 +178,7 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$util = new Encryption\Util( $this->view, $this->userId );
- $files = $util->findEncFiles( '/', 'encrypted' );
+ $files = $util->findEncFiles( '/'.$this->userId.'/');
//var_dump( $files );
--
GitLab
From 807740a07a5385b0761aa23128f859a203e8b71a Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 10:19:38 +0200
Subject: [PATCH 181/304] fix for losing mount point "/"
---
lib/files/filesystem.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index eadd8a93fa..d60d430d77 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -222,7 +222,10 @@ class Filesystem {
return false;
}
self::$defaultInstance = new View($root);
- self::$mounts = new Mount\Manager();
+
+ if(!self::$mounts) {
+ self::$mounts = new Mount\Manager();
+ }
//load custom mount config
self::initMountPoints($user);
--
GitLab
From 751487ded7657c2cbc56717105c2891c7c967b42 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 10:20:19 +0200
Subject: [PATCH 182/304] merge changes for files_encryption
---
lib/public/share.php | 82 +++++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 40 deletions(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index 29f9a1f095..0d90ffb9b7 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -133,83 +133,83 @@ class Share {
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
*/
- public static function getUsersSharingFile( $path, $user, $includeOwner = false, $removeDuplicates = true ) {
+ public static function getUsersSharingFile($path, $user, $includeOwner = false, $removeDuplicates = true) {
$path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
$path = '';
$shares = array();
- $view = new \OC\Files\View('/'.$user.'/files/');
+ $publicShare = false;
+ $view = new \OC\Files\View('/' . $user . '/files/');
foreach ($path_parts as $p) {
- $path .= '/'.$p;
+ $path .= '/' . $p;
$meta = $view->getFileInfo(\OC_Filesystem::normalizePath($path));
$source = $meta['fileid'];
-
+
// Fetch all shares of this file path from DB
$query = \OC_DB::prepare(
- 'SELECT share_with
- FROM
- `*PREFIX*share`
- WHERE
- item_source = ? AND share_type = ?'
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ?'
);
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_USER ) );
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ $result = $query->execute(array($source, self::SHARE_TYPE_USER));
+
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
}
- while( $row = $result->fetchRow() ) {
+ while ($row = $result->fetchRow()) {
$shares[] = $row['share_with'];
}
// We also need to take group shares into account
$query = \OC_DB::prepare(
- 'SELECT share_with
- FROM
- `*PREFIX*share`
- WHERE
- item_source = ? AND share_type = ?'
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ?'
);
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_GROUP ) );
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+ $result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
+
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
}
- while( $row = $result->fetchRow() ) {
+ while ($row = $result->fetchRow()) {
$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
$shares = array_merge($shares, $usersInGroup);
}
-
+
//check for public link shares
$query = \OC_DB::prepare(
- 'SELECT share_with
- FROM
- `*PREFIX*share`
- WHERE
- item_source = ? AND share_type = ?'
+ 'SELECT share_with
+ FROM
+ `*PREFIX*share`
+ WHERE
+ item_source = ? AND share_type = ?'
);
-
- $result = $query->execute( array( $source, self::SHARE_TYPE_LINK ) );
-
- if ( \OC_DB::isError( $result ) ) {
- \OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR );
+
+ $result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+
+ if (\OC_DB::isError($result)) {
+ \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
}
-
+
if ($result->fetchRow()) {
- $shares[] = "owncloud";
+ $publicShare = true;
}
}
// Include owner in list of users, if requested
- if ( $includeOwner ) {
+ if ($includeOwner) {
$shares[] = $user;
}
-
- return array_unique($shares);
+ return array("users" => array_unique($shares), "public" => $publicShare);
}
/**
@@ -514,6 +514,7 @@ class Share {
'fileSource' => $item['file_source'],
'shareType' => $shareType,
'shareWith' => $shareWith,
+ 'itemParent' => $item['parent'],
));
self::delete($item['id']);
\OC_Hook::emit('OCP\Share', 'post_unshare', array(
@@ -521,6 +522,7 @@ class Share {
'itemSource' => $itemSource,
'shareType' => $shareType,
'shareWith' => $shareWith,
+ 'itemParent' => $item['parent'],
));
return true;
}
--
GitLab
From 9b7f02f26736542a596d6e1dfb3b8cd9d1875395 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 10:20:52 +0200
Subject: [PATCH 183/304] removed FileProxy from test
---
tests/lib/cache/file.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 5dcd326880..7da5a8b85c 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -31,12 +31,13 @@ class Test_Cache_File extends Test_Cache {
//clear all proxies and hooks so we can do clean testing
OC_FileProxy::clearProxies();
OC_Hook::clear('OC_Filesystem');
-
+
+ //disabled atm
//enable only the encryption hook if needed
- if(OC_App::isEnabled('files_encryption')) {
- OC_FileProxy::register(new OC_FileProxy_Encryption());
- }
-
+ //if(OC_App::isEnabled('files_encryption')) {
+ // OC_FileProxy::register(new OC_FileProxy_Encryption());
+ //}
+
//set up temporary storage
\OC\Files\Filesystem::clearMounts();
\OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
--
GitLab
From 3d7534da7494e7e22cdffa880dc2158f0c6e4d25 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 10:21:56 +0200
Subject: [PATCH 184/304] improved files_encryption tests
---
apps/files_encryption/tests/crypt.php | 2 +-
apps/files_encryption/tests/keymanager.php | 2 +-
apps/files_encryption/tests/share.php | 2 +-
apps/files_encryption/tests/util.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index de7ae38b17..c694aa1140 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -66,7 +66,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
\OC_Util::tearDownFS();
\OC_User::setUserId('');
- \OC\Files\Filesystem::setView(false);
+ \OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index d24dcaa036..d3078fdac9 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -59,7 +59,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC_Util::tearDownFS();
\OC_User::setUserId('');
- \OC\Files\Filesystem::setView(false);
+ \OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index e2e26aa75b..6962cadc44 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -462,7 +462,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
\OC_Util::tearDownFS();
\OC_User::setUserId('');
- \OC\Files\Filesystem::setView(false);
+ \OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($user);
\OC_User::setUserId($user);
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 2abf409690..1e4e39cc47 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -64,7 +64,7 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
\OC_Util::tearDownFS();
\OC_User::setUserId('');
- \OC\Files\Filesystem::setView(false);
+ \OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->userId);
\OC_User::setUserId($this->userId);
--
GitLab
From 137039d35a6be69f42f79bf2bd15d7041a815c3b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 10:52:23 +0200
Subject: [PATCH 185/304] workaround for blank page need an other solution
---
apps/files_encryption/appinfo/app.php | 40 +++++++++++++--------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index b611eb798f..ec594fd19f 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -26,26 +26,26 @@ OCA\Encryption\Helper::registerFilesystemHooks();
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$view = new \OC\Files\View( '/' );
-
-$session = new OCA\Encryption\Session( $view );
-
-if (
- ! $session->getPrivateKey( \OCP\USER::getUser() )
- && OCP\User::isLoggedIn()
- && OCA\Encryption\Crypt::mode() == 'server'
-) {
-
- // Force the user to log-in again if the encryption key isn't unlocked
- // (happens when a user is logged in before the encryption app is
- // enabled)
- OCP\User::logout();
-
- header( "Location: " . OC::$WEBROOT.'/' );
-
- exit();
-
-}
+$view = new OC_FilesystemView( '/' );
+
+//$session = new \OCA\Encryption\Session( $view );
+//
+//if (
+// ! $session->getPrivateKey( \OCP\USER::getUser() )
+// && OCP\User::isLoggedIn()
+// && OCA\Encryption\Crypt::mode() == 'server'
+//) {
+//
+// // Force the user to log-in again if the encryption key isn't unlocked
+// // (happens when a user is logged in before the encryption app is
+// // enabled)
+// OCP\User::logout();
+//
+// header( "Location: " . OC::$WEBROOT.'/' );
+//
+// exit();
+//
+//}
// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
--
GitLab
From d8ae2fa80d004a7c9de7e1c6d012a6c0b6a423aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 15 May 2013 11:42:22 +0200
Subject: [PATCH 186/304] only let the user change the recovery admin settings
if a key passwords was entered.
---
apps/files_encryption/js/settings-admin.js | 41 +++++++++----------
apps/files_encryption/settings-admin.php | 5 ---
.../templates/settings-admin.php | 12 +++---
3 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 9cdb7aca68..2fffcf77b3 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -8,33 +8,32 @@
$(document).ready(function(){
// Trigger ajax on recoveryAdmin status change
+ var enabledStatus = $('#adminEnableRecovery').val();
+
+ $('input:password[name="recoveryPassword"]').keyup(function(event) {
+ var recoveryPassword = $( '#recoveryPassword' ).val();
+ var checkedButton = $('input:radio[name="adminEnableRecovery"]:checked').val();
+ var uncheckedValue = (1+parseInt(checkedButton)) % 2;
+ if (recoveryPassword != '' ) {
+ $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').removeAttr("disabled");
+ } else {
+ $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').attr("disabled", "true");
+ }
+ });
+
$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
var recoveryStatus = $( this ).val();
var recoveryPassword = $( '#recoveryPassword' ).val();
-
- if ( '' == recoveryPassword ) {
-
- // FIXME: add proper OC notification
- alert( 'You must set a recovery account password first' );
-
- } else {
-
- $.post(
- OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
- , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
- , function( data ) {
- alert( data );
- }
- );
-
- }
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
+ , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
+ , function( data ) {
+ alert( data );
+ }
+ );
}
);
- function blackListChange(){
- var blackList=$( '#encryption_blacklist' ).val().join( ',' );
- OC.AppConfig.setValue( 'files_encryption', 'type_blacklist', blackList );
- }
})
\ No newline at end of file
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
index ae9a85643e..66efc58436 100644
--- a/apps/files_encryption/settings-admin.php
+++ b/apps/files_encryption/settings-admin.php
@@ -10,18 +10,13 @@
$tmpl = new OCP\Template( 'files_encryption', 'settings-admin' );
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
-
// Check if an adminRecovery account is enabled for recovering files after lost pwd
$view = new OC_FilesystemView( '' );
$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
-$recoveryAdminUid = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminUid' );
-$tmpl->assign( 'blacklist', $blackList );
$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
-$tmpl->assign( 'recoveryAdminUid', $recoveryAdminUid );
\OCP\Util::addscript( 'files_encryption', 'settings-admin' );
\OCP\Util::addscript( 'core', 'multiselect' );
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index be7beecf69..95c1b66681 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -9,16 +9,14 @@
<?php p($l->t( "Enable encryption passwords recovery key (allow sharing to recovery key):" )); ?>
<br />
<br />
- <?php if ( empty( $_['recoveryAdminUid'] ) ): ?>
- <input type="password" name="recoveryPassword" id="recoveryPassword" />
- <label for="recoveryPassword">Recovery account password</label>
- <br />
- <?php endif; ?>
+ <input type="password" name="recoveryPassword" id="recoveryPassword" />
+ <label for="recoveryPassword">Recovery account password</label>
+ <br />
<input
type='radio'
name='adminEnableRecovery'
value='1'
- <?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : '' ); ?> />
+ <?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : 'disabled' ); ?> />
<?php p($l->t( "Enabled" )); ?>
<br />
@@ -26,7 +24,7 @@
type='radio'
name='adminEnableRecovery'
value='0'
- <?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : '' ); ?> />
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : 'disabled' ); ?> />
<?php p($l->t( "Disabled" )); ?>
</p>
</fieldset>
--
GitLab
From 5b160edebba2a10de83b09a8010a811321dd6370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 15 May 2013 14:02:13 +0200
Subject: [PATCH 187/304] check if the user knows the correct recovery password
before changing the recovery key settings
---
.gitignore | 1 +
apps/files_encryption/ajax/adminrecovery.php | 63 +++++++++++++++-----
apps/files_encryption/hooks/hooks.php | 3 +-
apps/files_encryption/js/settings-admin.js | 6 +-
apps/files_encryption/lib/crypt.php | 10 +++-
5 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index b57dd3d205..bc0c1d53a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ data-autotest
/tests/coverage*
/tests/autoconfig*
/tests/autotest*
+/l10n/.tx/
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 6a056dc7b3..520c7156c8 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -15,16 +15,37 @@ use OCA\Encryption;
$return = false;
+function checkPassword($view, $password, $recoveryKeyId) {
+ $pathKey = '/owncloud_private_key/'. $recoveryKeyId . ".private.key";
+ $pathControlData = '/control-file/controlfile.enc';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $recoveryKey = $view->file_get_contents( $pathKey );
+
+ $decryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricDecryptFileContent($recoveryKey, $password);
+
+ $controlData = $view->file_get_contents($pathControlData);
+ $decryptedControlData = \OCA\Encryption\Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if ($decryptedControlData === 'ownCloud') {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+
// Enable recoveryAdmin
-if (
- isset($_POST['adminEnableRecovery'])
- && 1 == $_POST['adminEnableRecovery']
-) {
+$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
- $view = new \OC\Files\View('/');
+if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
- $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+ $view = new \OC\Files\View('/');
if ($recoveryKeyId === null) {
$recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
@@ -38,8 +59,6 @@ if (
if (
(!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
|| !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
- && isset($_POST['recoveryPassword'])
- && !empty($_POST['recoveryPassword'])
) {
$keypair = \OCA\Encryption\Crypt::createKeypair();
@@ -60,25 +79,39 @@ if (
// Save private key
$view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
+ // create control file which let us check later on if the entered password was correct.
+ $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
+ if (!$view->is_dir('/control-file')) {
+ $view->mkdir('/control-file');
+ }
+ $view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
+
\OC_FileProxy::$enabled = true;
- }
+ // Set recoveryAdmin as enabled
+ OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
- // Set recoveryAdmin as enabled
- OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+ $return = true;
- $return = true;
+ } else { // get recovery key and check the password
+ $return = checkPassword($view, $_POST['recoveryPassword'] ,$recoveryKeyId);
+ if ($return) {
+ OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+ }
+ }
// Disable recoveryAdmin
} elseif (
isset($_POST['adminEnableRecovery'])
&& 0 == $_POST['adminEnableRecovery']
) {
+ $view = new \OC\Files\View('/');
+ $return = checkPassword($view, $_POST['recoveryPassword'], $recoveryKeyId);
- // Set recoveryAdmin as enabled
+ if ($return) {
+ // Set recoveryAdmin as disabled
OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
-
- $return = true;
+ }
}
// Return success or failure
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 31175d1c34..ed254fd8d8 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -59,7 +59,8 @@ class Hooks {
\OC_FileProxy::$enabled = true;
- $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
+ //$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, "helloworld" );
$session = new Session( $view );
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 2fffcf77b3..fa353901c3 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -25,12 +25,16 @@ $(document).ready(function(){
function() {
var recoveryStatus = $( this ).val();
+ var oldStatus = (1+parseInt(recoveryStatus)) % 2;
var recoveryPassword = $( '#recoveryPassword' ).val();
$.post(
OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
, { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
, function( data ) {
- alert( data );
+ if (data.status == "error") {
+ alert("Couldn't switch recovery key mode, please check your recovery key password!");
+ $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
+ }
}
);
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index f92930c2cb..5267ba81f5 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -217,7 +217,7 @@ class Crypt {
* @returns decrypted file
*/
public static function decrypt( $encryptedContent, $iv, $passphrase ) {
-
+
if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $plainContent;
@@ -463,9 +463,13 @@ class Crypt {
*/
public static function keyDecrypt( $encryptedContent, $privatekey ) {
- openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+ $result = @openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
- return $plainContent;
+ if ( $result ) {
+ return $plainContent;
+ }
+
+ return $result;
}
--
GitLab
From 1fbdc3ce8fc4c5430b9fd85a95e984a317c75778 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 14:32:50 +0200
Subject: [PATCH 188/304] fix for previous workaround
---
apps/files_encryption/appinfo/app.php | 41 ++++++++++++++-------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index ec594fd19f..e56d012fee 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -26,26 +26,27 @@ OCA\Encryption\Helper::registerFilesystemHooks();
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$view = new OC_FilesystemView( '/' );
-
-//$session = new \OCA\Encryption\Session( $view );
-//
-//if (
-// ! $session->getPrivateKey( \OCP\USER::getUser() )
-// && OCP\User::isLoggedIn()
-// && OCA\Encryption\Crypt::mode() == 'server'
-//) {
-//
-// // Force the user to log-in again if the encryption key isn't unlocked
-// // (happens when a user is logged in before the encryption app is
-// // enabled)
-// OCP\User::logout();
-//
-// header( "Location: " . OC::$WEBROOT.'/' );
-//
-// exit();
-//
-//}
+// check if we are logged in
+if (OCP\User::isLoggedIn()) {
+ $view = new OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
+
+ // check if user has a private key
+ if (
+ !$session->getPrivateKey(\OCP\USER::getUser())
+ && OCA\Encryption\Crypt::mode() === 'server'
+ ) {
+
+ // Force the user to log-in again if the encryption key isn't unlocked
+ // (happens when a user is logged in before the encryption app is
+ // enabled)
+ OCP\User::logout();
+
+ header("Location: " . OC::$WEBROOT . '/');
+
+ exit();
+ }
+}
// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
--
GitLab
From 63a790b415d0ad54f5d769976ff5c00f1c8df0eb Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 14:33:08 +0200
Subject: [PATCH 189/304] fix for broken tests
---
apps/files_encryption/hooks/hooks.php | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index ed254fd8d8..16e9f9177d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -52,16 +52,11 @@ class Hooks {
if(Helper::setupUser($util, $params['password']) === false) {
return false;
}
-
- \OC_FileProxy::$enabled = false;
-
+
$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
- \OC_FileProxy::$enabled = true;
-
- //$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
- $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, "helloworld" );
-
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
+
$session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
@@ -86,13 +81,9 @@ class Hooks {
$session->setLegacyKey( $plainLegacyKey );
}
-
- \OC_FileProxy::$enabled = false;
-
+
$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
- \OC_FileProxy::$enabled = false;
-
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
// app (see appinfo/spec.txt)
--
GitLab
From 64d94c540aeaba67e2f779b2551c72a80334aa3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 15 May 2013 16:12:20 +0200
Subject: [PATCH 190/304] enable admin to change the recovery password
---
apps/files_encryption/ajax/adminrecovery.php | 31 ++--------
apps/files_encryption/js/settings-admin.js | 59 +++++++++++++++++++
apps/files_encryption/lib/util.php | 28 +++++++++
apps/files_encryption/settings-personal.php | 1 +
.../templates/settings-admin.php | 27 ++++++++-
5 files changed, 118 insertions(+), 28 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 520c7156c8..0ab449709c 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -15,30 +15,6 @@ use OCA\Encryption;
$return = false;
-function checkPassword($view, $password, $recoveryKeyId) {
- $pathKey = '/owncloud_private_key/'. $recoveryKeyId . ".private.key";
- $pathControlData = '/control-file/controlfile.enc';
-
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $recoveryKey = $view->file_get_contents( $pathKey );
-
- $decryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricDecryptFileContent($recoveryKey, $password);
-
- $controlData = $view->file_get_contents($pathControlData);
- $decryptedControlData = \OCA\Encryption\Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
-
- \OC_FileProxy::$enabled = $proxyStatus;
-
- if ($decryptedControlData === 'ownCloud') {
- return true;
- } else {
- return false;
- }
-}
-
-
// Enable recoveryAdmin
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
@@ -94,7 +70,8 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
$return = true;
} else { // get recovery key and check the password
- $return = checkPassword($view, $_POST['recoveryPassword'] ,$recoveryKeyId);
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $return = $util->checkRecoveryPassword($_POST['recoveryPassword']);
if ($return) {
OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
}
@@ -105,8 +82,8 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
isset($_POST['adminEnableRecovery'])
&& 0 == $_POST['adminEnableRecovery']
) {
- $view = new \OC\Files\View('/');
- $return = checkPassword($view, $_POST['recoveryPassword'], $recoveryKeyId);
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $return = $util->checkRecoveryPassword($_POST['recoveryPassword']);
if ($return) {
// Set recoveryAdmin as disabled
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index fa353901c3..9bc6ab6433 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -5,6 +5,27 @@
* See the COPYING-README file.
*/
+OC.msg={
+ startSaving:function(selector){
+ $(selector)
+ .html( t('settings', 'Saving...') )
+ .removeClass('success')
+ .removeClass('error')
+ .stop(true, true)
+ .show();
+ },
+ finishedSaving:function(selector, data){
+ if( data.status === "success" ){
+ $(selector).html( data.data.message )
+ .addClass('success')
+ .stop(true, true)
+ .delay(3000)
+ .fadeOut(900);
+ }else{
+ $(selector).html( data.data.message ).addClass('error');
+ }
+ }
+};
$(document).ready(function(){
// Trigger ajax on recoveryAdmin status change
@@ -34,10 +55,48 @@ $(document).ready(function(){
if (data.status == "error") {
alert("Couldn't switch recovery key mode, please check your recovery key password!");
$('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
+ } else {
+ if (recoveryStatus == "0") {
+ $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+ $('input:password[name="changeRecoveryPassword"]').attr("disabled", "true");
+ $('input:password[name="changeRecoveryPassword"]').val("");
+ } else {
+ $('input:password[name="changeRecoveryPassword"]').removeAttr("disabled");
+ }
}
}
);
}
);
+
+ // change password
+
+ $('input:password[name="changeRecoveryPassword"]').keyup(function(event) {
+ var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+ var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+ if (newRecoveryPassword != '' && oldRecoveryPassword != '' ) {
+ $('button:button[name="submitChangeRecoveryKey"]').removeAttr("disabled");
+ } else {
+ $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+ }
+ });
+
+
+ $('button:button[name="submitChangeRecoveryKey"]').click(function() {
+ var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+ var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+ OC.msg.startSaving('#encryption .msg');
+ $.post(
+ OC.filePath( 'files_encryption', 'ajax', 'changeRecoveryPassword.php' )
+ , { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword }
+ , function( data ) {
+ if (data.status == "error") {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ } else {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ }
+ }
+ );
+ });
})
\ No newline at end of file
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 19c9cd72a1..6cb4ccb808 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1282,4 +1282,32 @@ class Util {
return $this->userFilesDir;
}
+ public function checkRecoveryPassword($password) {
+
+ $pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
+ $pathControlData = '/control-file/controlfile.enc';
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $recoveryKey = $this->view->file_get_contents($pathKey);
+
+ $decryptedRecoveryKey = Crypt::symmetricDecryptFileContent($recoveryKey, $password);
+
+ $controlData = $this->view->file_get_contents($pathControlData);
+ $decryptedControlData = Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ if ($decryptedControlData === 'ownCloud') {
+ return true;
+ }
+
+ return false;
+ }
+
+ public function getRecoveryKeyId() {
+ return $this->recoveryKeyId;
+ }
+
}
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 46efb61b02..90edc0eae2 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -32,6 +32,7 @@ $recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdm
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
\OCP\Util::addscript( 'files_encryption', 'settings-personal' );
+\OCP\Util::addScript( 'settings', 'personal' );
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 95c1b66681..18fea1845f 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -10,7 +10,7 @@
<br />
<br />
<input type="password" name="recoveryPassword" id="recoveryPassword" />
- <label for="recoveryPassword">Recovery account password</label>
+ <label for="recoveryPassword"><?php p($l->t( "Recovery account password" )); ?></label>
<br />
<input
type='radio'
@@ -27,5 +27,30 @@
<?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : 'disabled' ); ?> />
<?php p($l->t( "Disabled" )); ?>
</p>
+ <br /><br />
+ <p>
+ <strong><?php p($l->t( "Change encryption passwords recovery key:" )); ?></strong>
+ <br /><br />
+ <input
+ type="password"
+ name="changeRecoveryPassword"
+ id="oldRecoveryPassword"
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
+ <label for="oldRecoveryPassword"><?php p($l->t( "Old Recovery account password" )); ?></label>
+ <br />
+ <input
+ type="password"
+ name="changeRecoveryPassword"
+ id="newRecoveryPassword"
+ <?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
+ <label for="newRecoveryPassword"><?php p($l->t( "New Recovery account password" )); ?></label>
+ <br />
+ <button
+ type="button"
+ name="submitChangeRecoveryKey"
+ disabled><?php p($l->t( "Change Password" )); ?>
+ </button>
+ <span class="msg"></span>
+ </p>
</fieldset>
</form>
--
GitLab
From 1a31dc036ac3ca30b266ce2715e0adee3d112299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 15 May 2013 16:14:54 +0200
Subject: [PATCH 191/304] added missing file to enable the admin to change the
recovery key password
---
.../ajax/changeRecoveryPassword.php | 52 +++++++++++++++++++
1 file changed, 52 insertions(+)
create mode 100644 apps/files_encryption/ajax/changeRecoveryPassword.php
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
new file mode 100644
index 0000000000..d990796a4f
--- /dev/null
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Copyright (c) 2013, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to change recovery key password
+ *
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l=OC_L10N::get('core');
+
+$return = false;
+
+$oldPassword = $_POST['oldPassword'];
+$newPassword = $_POST['newPassword'];
+
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+
+$result = $util->checkRecoveryPassword($oldPassword);
+
+if ($result) {
+ $keyId = $util->getRecoveryKeyId();
+ $keyPath = '/owncloud_private_key/' . $keyId . ".private.key";
+ $view = new \OC\Files\View('/');
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedRecoveryKey = $view->file_get_contents($keyPath);
+ $decryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricDecryptFileContent($encryptedRecoveryKey, $oldPassword);
+ $encryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword);
+ $view->file_put_contents($keyPath, $encryptedRecoveryKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $return = true;
+}
+
+// success or failure
+if ($return) {
+ \OCP\JSON::success(array("data" => array( "message" => $l->t('Password successfully changed.'))));
+} else {
+ \OCP\JSON::error(array("data" => array( "message" => $l->t('Could not change the password. Maybe the old password was not correct.'))));
+}
\ No newline at end of file
--
GitLab
From 0916769f6764e2497f820419121599c3ce121e87 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 17:00:01 +0200
Subject: [PATCH 192/304] fix for SQLite3Result::fetchArray(): The
SQLite3Result object has not been correctly initialised in post_addToGroup
---
lib/public/share.php | 53 +++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index 0d90ffb9b7..b2eeb29234 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1519,31 +1519,34 @@ class Share {
}
public static function post_addToGroup($arguments) {
- // Find the group shares and check if the user needs a unique target
- $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
- $result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
- $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
- .' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
- .' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
- while ($item = $result->fetchRow()) {
- if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
- $itemTarget = null;
- } else {
- $itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
- $arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
- }
- if (isset($item['file_source'])) {
- $fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
- $arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
- } else {
- $fileTarget = null;
- }
- // Insert an extra row for the group share if the item or file target is unique for this user
- if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
- $query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
- self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
- $item['stime'], $item['file_source'], $fileTarget));
- \OC_DB::insertid('*PREFIX*share');
+
+ if(\OC_Config::getValue('installed')) {
+ // Find the group shares and check if the user needs a unique target
+ $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
+ $result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
+ .' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
+ .' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+ while ($item = $result->fetchRow()) {
+ if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
+ $itemTarget = null;
+ } else {
+ $itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
+ $arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
+ }
+ if (isset($item['file_source'])) {
+ $fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
+ $arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
+ } else {
+ $fileTarget = null;
+ }
+ // Insert an extra row for the group share if the item or file target is unique for this user
+ if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
+ $query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
+ self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
+ $item['stime'], $item['file_source'], $fileTarget));
+ \OC_DB::insertid('*PREFIX*share');
+ }
}
}
}
--
GitLab
From 57c0a7ed693fec6ef487b71a514202b24dd70df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 15 May 2013 17:56:45 +0200
Subject: [PATCH 193/304] add recovery key to all files if the user enabled the
feature and removes them again on disable
---
apps/files_encryption/ajax/userrecovery.php | 6 ++++
apps/files_encryption/lib/util.php | 34 +++++++++++++++++++
.../templates/settings-personal.php | 3 +-
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index 85a799011d..1f42b376e4 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -24,6 +24,12 @@ if (
// Save recovery preference to DB
$return = $util->setRecoveryForUser( $_POST['userEnableRecovery'] );
+
+ if ($_POST['userEnableRecovery'] == "1") {
+ $util->addRecoveryKeys();
+ } else {
+ $util->removeRecoveryKeys();
+ }
} else {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6cb4ccb808..6eee1ada8a 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1310,4 +1310,38 @@ class Util {
return $this->recoveryKeyId;
}
+ /**
+ * @brief add recovery key to all encrypted files
+ */
+ public function addRecoveryKeys($path = '/') {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath.$path);
+ foreach ($dirContent as $item) {
+ $filePath = substr($item['path'], 25);
+ if ($item['type'] == 'dir') {
+ $this->addRecoveryKey($filePath.'/');
+ } else {
+ $session = new Session(new \OC_FilesystemView('/'));
+ $sharingEnabled = \OCP\Share::isEnabled();
+ $file = substr($filePath, 0, -4);
+ $usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
+ $this->setSharedFileKeyfiles( $session, $usersSharing, $file );
+ }
+ }
+ }
+
+ /**
+ * @brief remove recovery key to all encrypted files
+ */
+ public function removeRecoveryKeys($path = '/') {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath.$path);
+ foreach ($dirContent as $item) {
+ $filePath = substr($item['path'], 25);
+ if ($item['type'] == 'dir') {
+ $this->removeRecoveryKeys($filePath.'/');
+ } else {
+ $file = substr($filePath, 0, -4);
+ $this->view->unlink($this->shareKeysPath.'/'.$file.'.'.$this->recoveryKeyId.'.shareKey');
+ }
+ }
+ }
}
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 00f567ecb2..33989416d3 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -48,6 +48,7 @@
</p>
<?php endif; ?>
<br />
+<!--
<p>
<label for="encryptAll"><?php p( $l->t( "Scan for unencrypted files and encrypt them" ) ); ?></label>
<br />
@@ -59,6 +60,6 @@
<div id="encryptAllSuccess"><?php p( $l->t( 'Scan complete' ) );?></div>
<div id="encryptAllError"><?php p( $l->t( 'Unable to scan and encrypt files' ) );?></div>
</p>
-
+-->
</fieldset>
</form>
--
GitLab
From 5fcb5f3aba90e24762d031ea4481ce65e34c018f Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 21:00:35 +0200
Subject: [PATCH 194/304] added test for password change
---
apps/files_encryption/tests/crypt.php | 34 +++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index c694aa1140..f84536aaa1 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -690,6 +690,40 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$view->unlink( $newFolder );
}
+ function testChangePassphrase() {
+
+ $filename = 'tmp-'.time();
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents( 'crypt://' . $filename );
+
+ $this->assertEquals( $this->dataLong, $decrypt );
+
+ // change password
+ \OC_User::setPassword('admin', 'test');
+
+ // relogin
+ $params['uid'] = $this->userId;
+ $params['password'] = 'test';
+ OCA\Encryption\Hooks::login($params);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents( 'crypt://' . $filename );
+
+ $this->assertEquals( $this->dataLong, $newDecrypt );
+
+ // tear down
+ // change password back
+ \OC_User::setPassword('admin', 'admin');
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->unlink( $filename );
+ }
// function testEncryption(){
//
// $key=uniqid();
--
GitLab
From ec2e193a4413fa2d02ab6d127b1697294330e2bf Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 21:01:03 +0200
Subject: [PATCH 195/304] removed unused code
---
apps/files_encryption/hooks/hooks.php | 38 ---------------------------
apps/files_encryption/lib/helper.php | 3 +--
2 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 16e9f9177d..8f03087e56 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -169,33 +169,6 @@ class Hooks {
}
}
-
- /**
- * @brief update the encryption key of the file uploaded by the client
- */
- public static function updateKeyfile( $params ) {
-
- if ( Crypt::mode() == 'client' ) {
-
- if ( isset( $params['properties']['key'] ) ) {
-
- $view = new \OC_FilesystemView( '/' );
- $userId = \OCP\User::getUser();
-
- Keymanager::setFileKey( $view, $params['path'], $userId, $params['properties']['key'] );
-
- } else {
-
- \OC_Log::write(
- 'Encryption library', "Client side encryption is enabled but the client doesn't provide a encryption key for the file!"
- , \OC_Log::ERROR
- );
-
- }
-
- }
-
- }
/*
* @brief check if files can be encrypted to every user.
@@ -426,17 +399,6 @@ class Hooks {
}
/**
- * @brief
- */
- public static function postUnshareAll( $params ) {
-
- // NOTE: It appears that this is never called for files, so
- // we may not need to implement it
-
- }
-
-
- /**
* @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
* @param array with oldpath and newpath
*
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 783cebeee5..6d5aae4e8b 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -37,7 +37,6 @@ class Helper {
\OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
\OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
\OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
- \OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );
}
/**
@@ -58,7 +57,7 @@ class Helper {
*/
public static function registerWebdavHooks() {
- \OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
+
}
/**
--
GitLab
From b75a0abb6bee24b3f6e8276d129af3271a05e5d1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 22:42:22 +0200
Subject: [PATCH 196/304] added test for rename folder
---
apps/files_encryption/tests/crypt.php | 36 +++++++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index f84536aaa1..6168f69415 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -690,6 +690,38 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$view->unlink( $newFolder );
}
+ function testRenameFolder() {
+
+ $filename = '/tmp-'.time();
+
+ $folder = '/folder';
+ $newFolder = '/newfolder';
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->mkdir($folder);
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $folder . $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents( 'crypt://' . $folder . $filename );
+
+ $this->assertEquals( $this->dataLong, $decrypt );
+
+ // rename folder
+ $view->rename($folder, $newFolder);
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents( 'crypt://' . $newFolder . $filename );
+
+ $this->assertEquals( $this->dataLong, $newDecrypt );
+
+ // tear down
+ $view->unlink( $newFolder );
+ }
+
function testChangePassphrase() {
$filename = 'tmp-'.time();
@@ -706,7 +738,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $decrypt );
// change password
- \OC_User::setPassword('admin', 'test');
+ \OC_User::setPassword($this->userId, 'test');
// relogin
$params['uid'] = $this->userId;
@@ -720,7 +752,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// tear down
// change password back
- \OC_User::setPassword('admin', 'admin');
+ \OC_User::setPassword($this->userId, $this->pass);
$view = new \OC\Files\View('/' . $this->userId . '/files');
$view->unlink( $filename );
}
--
GitLab
From f355d797ff1dc5f92d09acbee48f3d6ff9fb4ecc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 May 2013 00:23:05 +0200
Subject: [PATCH 197/304] Port OC.dialogs to use octemplate except for prompt()
and form(). Also load octemplate per default.
---
core/css/styles.css | 3 +
core/js/oc-dialogs.js | 338 +++++++++++++++++++--------------
core/templates/filepicker.html | 11 ++
core/templates/message.html | 3 +
lib/base.php | 1 +
5 files changed, 216 insertions(+), 140 deletions(-)
create mode 100644 core/templates/filepicker.html
create mode 100644 core/templates/message.html
diff --git a/core/css/styles.css b/core/css/styles.css
index 93f2cecbfe..ee00196d66 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -385,10 +385,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
#dirup {width:4%;}
#dirtree {width:92%;}
#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
+#filelist img { margin: 2px 1em 0 4px; }
+#filelist .date { float:right;margin-right:1em; }
.filepicker_element_selected { background-color:lightblue;}
.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
/* ---- CATEGORIES ---- */
#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 990c3f8bf3..c0c035bafd 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -1,7 +1,7 @@
/**
* ownCloud
*
- * @author Bartek Przybylski
+ * @author Bartek Przybylski,Christopher Schäpers, Thomas Tanghus
* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
*
* This library is free software; you can redistribute it and/or
@@ -31,8 +31,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
alert:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-alert"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ OCdialogs.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays info dialog
@@ -42,8 +41,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
info:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-info"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ OCdialogs.message(text, title, 'info', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays confirmation dialog
@@ -53,8 +51,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
confirm:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-notice"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal);
+ OCdialogs.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
},
/**
* prompt for user input
@@ -66,7 +63,7 @@ var OCdialogs = {
prompt:function(text, title, default_value, callback, modal) {
var input = '<input type="text" id="oc-dialog-prompt-input" value="' + escapeHTML(default_value) + '" style="width:90%">';
var content = '<p><span class="ui-icon ui-icon-pencil"></span>' + escapeHTML(text) + ':<br/>' + input + '</p>';
- OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ OCdialogs.message(content, title, 'prompt', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* prompt user for input with custom form
@@ -130,6 +127,39 @@ var OCdialogs = {
});
OCdialogs.dialogs_counter++;
},
+ _getFilePickerTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$filePickerTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
+ self.$filePickerTemplate = $(tmpl);
+ self.$listTmpl = self.$filePickerTemplate.find('#filelist li:first-child').detach();
+ defer.resolve(self.$filePickerTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$filePickerTemplate);
+ }
+ return defer.promise();
+ },
+ _getMessageTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$messageTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+ self.$messageTemplate = $(tmpl);
+ defer.resolve(self.$messageTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$messageTemplate);
+ }
+ return defer.promise();
+ },
/**
* show a file picker to pick a file from
* @param title dialog title
@@ -139,132 +169,146 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
filepicker:function(title, callback, multiselect, mimetype_filter, modal) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_content = '<button id="dirup">↑</button><select id="dirtree"></select><div id="filelist"></div>';
- var dialog_loader = '<div class="filepicker_loader"><img src="' + OC.filePath('gallery','img','loading.gif') + '"></div>';
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + dialog_content + dialog_loader + '</div>';
- if (modal === undefined) { modal = false };
- if (multiselect === undefined) { multiselect = false };
- if (mimetype_filter === undefined) { mimetype_filter = '' };
+ $.when(this._getFilePickerTemplate()).then(function($tmpl) {
+ var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+ var dialog_id = '#' + dialog_name;
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title
+ }).data('path', '/');
- $('body').append(dialog_div);
+ if (modal === undefined) { modal = false };
+ if (multiselect === undefined) { multiselect = false };
+ if (mimetype_filter === undefined) { mimetype_filter = '' };
- $(dialog_id).data('path', '/');
+ $('body').append($dlg);
- $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
- $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
+ $dlg.find('#dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
+ $dlg.find('#dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
- $(dialog_id).ready(function(){
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) {
- OCdialogs.fillFilePicker(request, dialog_id);
- });
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: "httpd/unix-directory" }, function(request) {
- OCdialogs.fillTreeList(request, dialog_id);
- });
- }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+ $dlg.find('#filelist').empty().addClass('loading');
+ $dlg.ready(function(){
+ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'),
+ {mimetype: mimetype_filter},
+ function(response) {
+ OCdialogs.fillFilePicker(response, dialog_id);
+ });
+ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'),
+ {mimetype: 'httpd/unix-directory'},
+ function(response) {
+ OCdialogs.fillTreeList(response, dialog_id);
+ });
+ }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
- // build buttons
- var functionToCall = function() {
- if (callback !== undefined) {
- var datapath;
- if (multiselect === true) {
- datapath = [];
- $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
- datapath.push( $(dialog_id).data('path') + $(element).text() );
- });
- } else {
- var datapath = $(dialog_id).data('path');
- datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+ // build buttons
+ var functionToCall = function() {
+ if (callback !== undefined) {
+ var datapath;
+ if (multiselect === true) {
+ datapath = [];
+ $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
+ datapath.push( $(dialog_id).data('path') + $(element).text() );
+ });
+ } else {
+ var datapath = $(dialog_id).data('path');
+ datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+ }
+ callback(datapath);
+ $(dialog_id).dialog('close');
}
- callback(datapath);
- $(dialog_id).dialog('close');
- }
- };
- var buttonlist = [{
- text: t('core', 'Choose'),
- click: functionToCall
- },
- {
- text: t('core', 'Cancel'),
- click: function(){$(dialog_id).dialog('close'); }
- }];
+ };
+ var buttonlist = [{
+ text: t('core', 'Choose'),
+ click: functionToCall
+ },
+ {
+ text: t('core', 'Cancel'),
+ click: function(){$(dialog_id).dialog('close'); }
+ }];
- $(dialog_id).dialog({
- width: (4/9)*$(document).width(),
- height: 420,
- modal: modal,
- buttons: buttonlist
+ $(dialog_id).dialog({
+ width: (4/9)*$(document).width(),
+ height: 420,
+ modal: modal,
+ buttons: buttonlist
+ });
+ OCdialogs.dialogs_counter++;
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file picker template'));
});
- OCdialogs.dialogs_counter++;
},
/**
* Displays raw dialog
* You better use a wrapper instead ...
*/
message:function(content, title, dialog_type, buttons, callback, modal) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
- if (modal === undefined) { modal = false };
- $('body').append(dialog_div);
- var buttonlist = [];
- switch (buttons) {
- case OCdialogs.YES_NO_BUTTONS:
- buttonlist = [{
- text: t('core', 'Yes'),
- click: function(){
- if (callback !== undefined) { callback(true) };
- $(dialog_id).dialog('close');
- }
- },
- {
- text: t('core', 'No'),
- click: function(){
- if (callback !== undefined) { callback(false) };
- $(dialog_id).dialog('close');
- }
- }];
- break;
- case OCdialogs.OK_BUTTON:
- var functionToCall;
- switch(dialog_type) {
- case OCdialogs.ALERT_DIALOG:
- functionToCall = function() {
+ $.when(this._getMessageTemplate()).then(function($tmpl) {
+ var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+ var dialog_id = '#' + dialog_name;
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title,
+ message: content,
+ type: dialog_type
+ });
+ if (modal === undefined) { modal = false };
+ $('body').append($dlg);
+ var buttonlist = [];
+ switch (buttons) {
+ case OCdialogs.YES_NO_BUTTONS:
+ buttonlist = [{
+ text: t('core', 'Yes'),
+ click: function(){
+ if (callback !== undefined) { callback(true) };
$(dialog_id).dialog('close');
- if(callback !== undefined) { callback() };
- };
- break;
- case OCdialogs.PROMPT_DIALOG:
- buttonlist[1] = {
- text: t('core', 'Cancel'),
- click: function() { $(dialog_id).dialog('close'); }
- };
- functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
- break;
- }
- buttonlist[0] = {
- text: t('core', 'Ok'),
- click: functionToCall
- };
- break;
- };
+ }
+ },
+ {
+ text: t('core', 'No'),
+ click: function(){
+ if (callback !== undefined) { callback(false) };
+ $(dialog_id).dialog('close');
+ }
+ }];
+ break;
+ case OCdialogs.OK_BUTTON:
+ var functionToCall;
+ switch(dialog_type) {
+ case 'prompt':
+ buttonlist[1] = {
+ text: t('core', 'Cancel'),
+ click: function() { $(dialog_id).dialog('close'); }
+ };
+ functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
+ break;
+ default:
+ functionToCall = function() {
+ $(dialog_id).dialog('close');
+ if(callback !== undefined) { callback() };
+ };
+ break;
+ }
+ buttonlist[0] = {
+ text: t('core', 'Ok'),
+ click: functionToCall
+ };
+ break;
+ };
- $(dialog_id).dialog({
- width: (4/9) * $(document).width(),
- height: 180,
- modal: modal,
- buttons: buttonlist
+ $(dialog_id).dialog({
+ modal: modal,
+ buttons: buttonlist
+ });
+ OCdialogs.dialogs_counter++;
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file picker template'));
});
- OCdialogs.dialogs_counter++;
},
// dialog button types
YES_NO_BUTTONS: 70,
OK_BUTTONS: 71,
- // dialogs types
- ALERT_DIALOG: 80,
- INFO_DIALOG: 81,
- FORM_DIALOG: 82,
// used to name each dialog
dialogs_counter: 0,
@@ -278,7 +322,7 @@ var OCdialogs = {
prompt_ok_handler: function(callback, dialog_id) {
$(dialog_id).dialog('close');
- if (callback !== undefined) { callback($(dialog_id + " input#oc-dialog-prompt-input").val()) };
+ if (callback !== undefined) { callback($(dialog_id + ' input#oc-dialog-prompt-input').val()) };
},
form_ok_handler: function(callback, dialog_id) {
@@ -297,8 +341,7 @@ var OCdialogs = {
* fills the filepicker with files
*/
fillFilePicker:function(request, dialog_content_id) {
- var template_content = '<img src="*MIMETYPEICON*" style="margin: 2px 1em 0 4px;"><span class="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div>';
- var template = '<div data-entryname="*ENTRYNAME*" data-dcid="' + escapeHTML(dialog_content_id) + '" data="*ENTRYTYPE*">*CONTENT*</div>';
+ var $filelist = $(dialog_content_id + ' #filelist').empty();
var files = '';
var dirs = [];
var others = [];
@@ -309,14 +352,24 @@ var OCdialogs = {
others.push(file);
}
});
+
var sorted = dirs.concat(others);
- for (var i = 0; i < sorted.length; i++) {
- files_content = template_content.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon);
- files += template.replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)).replace('*CONTENT*', files_content);
- }
- $(dialog_content_id + ' #filelist').html(files);
- $('#filelist div').click(function() {
+ var self = this;
+ $.each(sorted, function(idx, entry) {
+ $li = self.$listTmpl.octemplate({
+ type: entry.type,
+ dcid: dialog_content_id,
+ imgsrc: entry.mimetype_icon,
+ filename: entry.name,
+ date: OC.mtime2date(entry.mtime)
+ });
+ $filelist.append($li);
+ });
+
+ $filelist.removeClass('loading');
+
+ $filelist.on('click', 'li', function() {
OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
});
@@ -326,24 +379,29 @@ var OCdialogs = {
* fills the tree list with directories
*/
fillTreeList: function(request, dialog_id) {
- var template = '<option value="*COUNT*">*NAME*</option>';
- var paths = '<option value="0">' + escapeHTML($(dialog_id).data('path')) + '</option>';
+ var $dirtree = $(dialog_id + ' #dirtree').empty();
+ var $template = $('<option value="{count}">{name}</option>');
+ $dirtree.append($template.octemplate({
+ count: 0,
+ name: $(dialog_id).data('path')
+ }));
$.each(request.data, function(index, file) {
- paths += template.replace('*COUNT*', index).replace('*NAME*', escapeHTML(file.name));
+ $dirtree.append($template.octemplate({
+ count: index,
+ name: file.name
+ }));
});
-
- $(dialog_id + ' #dirtree').html(paths);
},
/**
* handle selection made in the tree list
*/
handleTreeListSelect:function(event) {
- if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
- $(event.data.dcid).data('path', $("option:selected", this).html());
+ if ($('option:selected', this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
+ $(event.data.dcid).data('path', $('option:selected', this).html());
} else {
- $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $("option:selected", this).html() + '/');
+ $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $('option:selected', this).html() + '/');
}
- $(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible');
+ $(event.data.dcid).find('#filelist').addClass('loading');
$.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
{
@@ -356,7 +414,7 @@ var OCdialogs = {
OC.filePath('files', 'ajax', 'rawlist.php'),
{
dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
+ mimetype: 'httpd/unix-directory'
},
function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
);
@@ -366,13 +424,13 @@ var OCdialogs = {
*/
filepickerDirUp:function(event) {
var old_path = $(event.data.dcid).data('path');
- if ( old_path !== "/") {
+ if ( old_path !== '/') {
var splitted_path = old_path.split("/");
var new_path = ""
for (var i = 0; i < splitted_path.length - 2; i++) {
- new_path += splitted_path[i] + "/"
+ new_path += splitted_path[i] + '/'
}
- $(event.data.dcid).data('path', new_path);
+ $(event.data.dcid).data('path', new_path).find('#filelist').empty().addClass('loading');;
$.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
{
@@ -385,7 +443,7 @@ var OCdialogs = {
OC.filePath('files', 'ajax', 'rawlist.php'),
{
dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
+ mimetype: 'httpd/unix-directory'
},
function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
);
@@ -395,16 +453,16 @@ var OCdialogs = {
* handle clicks made in the filepicker
*/
handlePickerClick:function(element, name, dialog_content_id) {
- if ( $(element).attr('data') === 'file' ){
+ if ( $(element).data('type') === 'file' ){
if ( $(dialog_content_id).data('multiselect') !== true) {
$(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected');
}
$(element).toggleClass('filepicker_element_selected');
return;
- } else if ( $(element).attr('data') === 'dir' ) {
+ } else if ( $(element).data('type') === 'dir' ) {
var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' );
$(dialog_content_id).data('path', datapath);
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible');
+ $(dialog_content_id).find('#filelist').empty().addClass('loading');
$.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
{
@@ -417,7 +475,7 @@ var OCdialogs = {
OC.filePath('files', 'ajax', 'rawlist.php'),
{
dir: datapath,
- mimetype: "httpd/unix-directory"
+ mimetype: 'httpd/unix-directory'
},
function(request) { OCdialogs.fillTreeList(request, dialog_content_id) }
);
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
new file mode 100644
index 0000000000..f29de390ef
--- /dev/null
+++ b/core/templates/filepicker.html
@@ -0,0 +1,11 @@
+<div id="{dialog_name}" title="{title}">
+ <button id="dirup">↑</button>
+ <select id="dirtree"></select>
+ <ul id="filelist">
+ <li data-entryname="{filename}" data-type="{type}" data-dcid="{dcid}">
+ <img src="{imgsrc}" />
+ <span class="filename">{filename}</span>
+ <span class="date">{date}</span>
+ </li>
+ </ul>
+</div>
diff --git a/core/templates/message.html b/core/templates/message.html
new file mode 100644
index 0000000000..59048100f3
--- /dev/null
+++ b/core/templates/message.html
@@ -0,0 +1,3 @@
+<div id="{dialog_name}" title="{title}">
+ <p><span class="ui-icon ui-icon-{type}"></span>{message}</p>
+</div>
diff --git a/lib/base.php b/lib/base.php
index 667202d3ae..2e2cee97eb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -260,6 +260,7 @@ class OC {
OC_Util::addScript("jquery-tipsy");
OC_Util::addScript("compatibility");
OC_Util::addScript("oc-dialogs");
+ OC_Util::addScript("octemplate");
OC_Util::addScript("js");
OC_Util::addScript("eventsource");
OC_Util::addScript("config");
--
GitLab
From 8f963b95e53e54220bcce1931599496d9aa797b1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 00:30:01 +0200
Subject: [PATCH 198/304] added test for share with group
---
apps/files_encryption/tests/share.php | 74 +++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 6962cadc44..e5427fdf50 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -79,6 +79,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->loginHelper('user1', true);
$this->loginHelper('user2', true);
$this->loginHelper('user3', true);
+
+ // create group and assign users
+ \OC_Group::createGroup('group1');
+ \OC_Group::addToGroup('user2', 'group1');
+ \OC_Group::addToGroup('user3', 'group1');
}
function tearDown()
@@ -90,10 +95,15 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
OC_App::disable('files_trashbin');
}
+ // clean group
+ \OC_Group::deleteGroup('group1');
+
// cleanup users
\OC_User::deleteUser('user1');
\OC_User::deleteUser('user2');
\OC_User::deleteUser('user3');
+
+ \OC_FileProxy::clearProxies();
}
function testShareFile($withTeardown = true)
@@ -454,6 +464,70 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
}
+ function testShareFileWithGroup()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user2 and user3 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user3.shareKey'));
+
+ // login as user1
+ $this->loginHelper('user2');
+
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user3.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+
+ }
+
function loginHelper($user, $create = false)
{
if ($create) {
--
GitLab
From c0c4fe5fd3cd575656ed30b4464bb6bc3c6d4f40 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 00:31:17 +0200
Subject: [PATCH 199/304] fix if file is not yet created
---
apps/files_encryption/lib/proxy.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 36d05d7e0f..1d60770b4d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -131,8 +131,13 @@ class Proxy extends \OC_FileProxy {
$encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
$sharingEnabled = \OCP\Share::isEnabled();
-
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
+
+ // if file exists try to get sharing users
+ if($view->file_exists($path)) {
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
+ } else {
+ $uniqueUserIds[] = $userId;
+ }
// Fetch public keys for all users who will share the file
$publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
--
GitLab
From c651950a17cf1381a832e172191e4f4cc172569b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 00:34:45 +0200
Subject: [PATCH 200/304] fix for re-share and removed check if file exists
because we are sometime into a pre_put_contents hook
---
apps/files_encryption/hooks/hooks.php | 3 ++-
apps/files_encryption/lib/util.php | 33 ++++++++++++++++-----------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 8f03087e56..f843c7027d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -231,8 +231,9 @@ class Hooks {
$util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
+ $share = $util->getParentFromShare($params['id']);
//if parent is set, then this is a re-share action
- if ($params['parent']) {
+ if ($share['parent'] != null) {
// get the parent from current share
$parent = $util->getShareParent($params['parent']);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6eee1ada8a..91d86cc855 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1133,19 +1133,7 @@ class Util {
}
- // Make path relative for use by $view
- $relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename);
-
- // Check that the filename we're using is working
- if ( $this->view->file_exists( $relpath ) ) {
-
- return array ( $fileOwnerUid, $filename );
-
- } else {
-
- return false;
-
- }
+ return array ( $fileOwnerUid, $filename );
}
@@ -1230,6 +1218,25 @@ class Util {
}
+ /**
+ * @brief get shares parent.
+ * @param int $id of the current share
+ * @return array of the parent
+ */
+ public static function getParentFromShare( $id ) {
+
+ $query = \OC_DB::prepare( 'SELECT `parent`'
+ .' FROM `*PREFIX*share`'
+ .' WHERE `id` = ?' );
+
+ $result = $query->execute( array( $id ) );
+
+ $row = $result->fetchRow();
+
+ return $row;
+
+ }
+
/**
* @brief get owner of the shared files.
* @param int $Id of a share
--
GitLab
From 0fca2f8f319d77b056516216ade0a931d21a2a69 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 00:36:40 +0200
Subject: [PATCH 201/304] added tests for put content, get content, touch and
fopen
---
apps/files_encryption/tests/crypt.php | 75 +++++++++++++++++++++-
apps/files_encryption/tests/keymanager.php | 2 +-
apps/files_encryption/tests/util.php | 2 +-
3 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 6168f69415..3916b0e15e 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -77,7 +77,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
}
function tearDown() {
-
+ \OC_FileProxy::clearProxies();
}
function testGenerateKey() {
@@ -756,6 +756,79 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$view = new \OC\Files\View('/' . $this->userId . '/files');
$view->unlink( $filename );
}
+
+ function testViewFilePutAndGetContents() {
+
+ $filename = '/tmp-'.time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents( $filename );
+
+ $this->assertEquals( $this->dataShort, $decrypt );
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFileLong = $view->file_put_contents( $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFileLong ) );
+
+ // Get file decrypted contents
+ $decryptLong = $view->file_get_contents( $filename );
+
+ $this->assertEquals( $this->dataLong, $decryptLong );
+
+ // tear down
+ $view->unlink( $filename );
+ }
+
+ function testTouchFile() {
+ $filename = '/tmp-'.time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ $view->touch($filename);
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents( $filename );
+
+ $this->assertEquals( $this->dataShort, $decrypt );
+
+ // tear down
+ $view->unlink( $filename );
+ }
+
+ function testFopenFile() {
+ $filename = '/tmp-'.time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ $handle = $view->fopen($filename, 'r');
+
+ // Get file decrypted contents
+ $decrypt = fgets($handle);
+
+ $this->assertEquals( $this->dataShort, $decrypt );
+
+ // tear down
+ $view->unlink( $filename );
+ }
// function testEncryption(){
//
// $key=uniqid();
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index d3078fdac9..28452d779c 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -71,7 +71,7 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
function tearDown(){
\OC_FileProxy::$enabled = true;
-
+ \OC_FileProxy::clearProxies();
}
function testGetPrivateKey() {
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 1e4e39cc47..2d637e2053 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -80,7 +80,7 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
function tearDown(){
m::close();
-
+ \OC_FileProxy::clearProxies();
}
/**
--
GitLab
From 67a80e1870a47c0f060c58f65b3a6fc838c52b70 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 00:44:40 +0200
Subject: [PATCH 202/304] improved tests for touch
---
apps/files_encryption/tests/crypt.php | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 3916b0e15e..1caa9ea7da 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -788,7 +788,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$view->unlink( $filename );
}
- function testTouchFile() {
+ function testTouchExistingFile() {
$filename = '/tmp-'.time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
@@ -809,6 +809,27 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$view->unlink( $filename );
}
+ function testTouchFile() {
+ $filename = '/tmp-'.time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ $view->touch($filename);
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = $view->file_get_contents( $filename );
+
+ $this->assertEquals( $this->dataShort, $decrypt );
+
+ // tear down
+ $view->unlink( $filename );
+ }
+
function testFopenFile() {
$filename = '/tmp-'.time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
--
GitLab
From c8bbf90feb5a874b9988198747b79c4f43708740 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 May 2013 00:23:05 +0200
Subject: [PATCH 203/304] Port OC.dialogs to use octemplate except for prompt()
and form(). Also load octemplate per default.
---
core/css/styles.css | 3 +
core/js/oc-dialogs.js | 338 +++++++++++++++++++--------------
core/templates/filepicker.html | 11 ++
core/templates/message.html | 3 +
lib/base.php | 1 +
5 files changed, 216 insertions(+), 140 deletions(-)
create mode 100644 core/templates/filepicker.html
create mode 100644 core/templates/message.html
diff --git a/core/css/styles.css b/core/css/styles.css
index 93f2cecbfe..ee00196d66 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -385,10 +385,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
#dirup {width:4%;}
#dirtree {width:92%;}
#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
+#filelist img { margin: 2px 1em 0 4px; }
+#filelist .date { float:right;margin-right:1em; }
.filepicker_element_selected { background-color:lightblue;}
.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
/* ---- CATEGORIES ---- */
#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 990c3f8bf3..c0c035bafd 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -1,7 +1,7 @@
/**
* ownCloud
*
- * @author Bartek Przybylski
+ * @author Bartek Przybylski,Christopher Schäpers, Thomas Tanghus
* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
*
* This library is free software; you can redistribute it and/or
@@ -31,8 +31,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
alert:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-alert"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ OCdialogs.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays info dialog
@@ -42,8 +41,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
info:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-info"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ OCdialogs.message(text, title, 'info', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays confirmation dialog
@@ -53,8 +51,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
confirm:function(text, title, callback, modal) {
- var content = '<p><span class="ui-icon ui-icon-notice"></span>' + escapeHTML(text) + '</p>';
- OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal);
+ OCdialogs.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
},
/**
* prompt for user input
@@ -66,7 +63,7 @@ var OCdialogs = {
prompt:function(text, title, default_value, callback, modal) {
var input = '<input type="text" id="oc-dialog-prompt-input" value="' + escapeHTML(default_value) + '" style="width:90%">';
var content = '<p><span class="ui-icon ui-icon-pencil"></span>' + escapeHTML(text) + ':<br/>' + input + '</p>';
- OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+ OCdialogs.message(content, title, 'prompt', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* prompt user for input with custom form
@@ -130,6 +127,39 @@ var OCdialogs = {
});
OCdialogs.dialogs_counter++;
},
+ _getFilePickerTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$filePickerTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
+ self.$filePickerTemplate = $(tmpl);
+ self.$listTmpl = self.$filePickerTemplate.find('#filelist li:first-child').detach();
+ defer.resolve(self.$filePickerTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$filePickerTemplate);
+ }
+ return defer.promise();
+ },
+ _getMessageTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$messageTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+ self.$messageTemplate = $(tmpl);
+ defer.resolve(self.$messageTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$messageTemplate);
+ }
+ return defer.promise();
+ },
/**
* show a file picker to pick a file from
* @param title dialog title
@@ -139,132 +169,146 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
filepicker:function(title, callback, multiselect, mimetype_filter, modal) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_content = '<button id="dirup">↑</button><select id="dirtree"></select><div id="filelist"></div>';
- var dialog_loader = '<div class="filepicker_loader"><img src="' + OC.filePath('gallery','img','loading.gif') + '"></div>';
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + dialog_content + dialog_loader + '</div>';
- if (modal === undefined) { modal = false };
- if (multiselect === undefined) { multiselect = false };
- if (mimetype_filter === undefined) { mimetype_filter = '' };
+ $.when(this._getFilePickerTemplate()).then(function($tmpl) {
+ var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+ var dialog_id = '#' + dialog_name;
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title
+ }).data('path', '/');
- $('body').append(dialog_div);
+ if (modal === undefined) { modal = false };
+ if (multiselect === undefined) { multiselect = false };
+ if (mimetype_filter === undefined) { mimetype_filter = '' };
- $(dialog_id).data('path', '/');
+ $('body').append($dlg);
- $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
- $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
+ $dlg.find('#dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
+ $dlg.find('#dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
- $(dialog_id).ready(function(){
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) {
- OCdialogs.fillFilePicker(request, dialog_id);
- });
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: "httpd/unix-directory" }, function(request) {
- OCdialogs.fillTreeList(request, dialog_id);
- });
- }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+ $dlg.find('#filelist').empty().addClass('loading');
+ $dlg.ready(function(){
+ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'),
+ {mimetype: mimetype_filter},
+ function(response) {
+ OCdialogs.fillFilePicker(response, dialog_id);
+ });
+ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'),
+ {mimetype: 'httpd/unix-directory'},
+ function(response) {
+ OCdialogs.fillTreeList(response, dialog_id);
+ });
+ }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
- // build buttons
- var functionToCall = function() {
- if (callback !== undefined) {
- var datapath;
- if (multiselect === true) {
- datapath = [];
- $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
- datapath.push( $(dialog_id).data('path') + $(element).text() );
- });
- } else {
- var datapath = $(dialog_id).data('path');
- datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+ // build buttons
+ var functionToCall = function() {
+ if (callback !== undefined) {
+ var datapath;
+ if (multiselect === true) {
+ datapath = [];
+ $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
+ datapath.push( $(dialog_id).data('path') + $(element).text() );
+ });
+ } else {
+ var datapath = $(dialog_id).data('path');
+ datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+ }
+ callback(datapath);
+ $(dialog_id).dialog('close');
}
- callback(datapath);
- $(dialog_id).dialog('close');
- }
- };
- var buttonlist = [{
- text: t('core', 'Choose'),
- click: functionToCall
- },
- {
- text: t('core', 'Cancel'),
- click: function(){$(dialog_id).dialog('close'); }
- }];
+ };
+ var buttonlist = [{
+ text: t('core', 'Choose'),
+ click: functionToCall
+ },
+ {
+ text: t('core', 'Cancel'),
+ click: function(){$(dialog_id).dialog('close'); }
+ }];
- $(dialog_id).dialog({
- width: (4/9)*$(document).width(),
- height: 420,
- modal: modal,
- buttons: buttonlist
+ $(dialog_id).dialog({
+ width: (4/9)*$(document).width(),
+ height: 420,
+ modal: modal,
+ buttons: buttonlist
+ });
+ OCdialogs.dialogs_counter++;
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file picker template'));
});
- OCdialogs.dialogs_counter++;
},
/**
* Displays raw dialog
* You better use a wrapper instead ...
*/
message:function(content, title, dialog_type, buttons, callback, modal) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
- if (modal === undefined) { modal = false };
- $('body').append(dialog_div);
- var buttonlist = [];
- switch (buttons) {
- case OCdialogs.YES_NO_BUTTONS:
- buttonlist = [{
- text: t('core', 'Yes'),
- click: function(){
- if (callback !== undefined) { callback(true) };
- $(dialog_id).dialog('close');
- }
- },
- {
- text: t('core', 'No'),
- click: function(){
- if (callback !== undefined) { callback(false) };
- $(dialog_id).dialog('close');
- }
- }];
- break;
- case OCdialogs.OK_BUTTON:
- var functionToCall;
- switch(dialog_type) {
- case OCdialogs.ALERT_DIALOG:
- functionToCall = function() {
+ $.when(this._getMessageTemplate()).then(function($tmpl) {
+ var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+ var dialog_id = '#' + dialog_name;
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title,
+ message: content,
+ type: dialog_type
+ });
+ if (modal === undefined) { modal = false };
+ $('body').append($dlg);
+ var buttonlist = [];
+ switch (buttons) {
+ case OCdialogs.YES_NO_BUTTONS:
+ buttonlist = [{
+ text: t('core', 'Yes'),
+ click: function(){
+ if (callback !== undefined) { callback(true) };
$(dialog_id).dialog('close');
- if(callback !== undefined) { callback() };
- };
- break;
- case OCdialogs.PROMPT_DIALOG:
- buttonlist[1] = {
- text: t('core', 'Cancel'),
- click: function() { $(dialog_id).dialog('close'); }
- };
- functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
- break;
- }
- buttonlist[0] = {
- text: t('core', 'Ok'),
- click: functionToCall
- };
- break;
- };
+ }
+ },
+ {
+ text: t('core', 'No'),
+ click: function(){
+ if (callback !== undefined) { callback(false) };
+ $(dialog_id).dialog('close');
+ }
+ }];
+ break;
+ case OCdialogs.OK_BUTTON:
+ var functionToCall;
+ switch(dialog_type) {
+ case 'prompt':
+ buttonlist[1] = {
+ text: t('core', 'Cancel'),
+ click: function() { $(dialog_id).dialog('close'); }
+ };
+ functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
+ break;
+ default:
+ functionToCall = function() {
+ $(dialog_id).dialog('close');
+ if(callback !== undefined) { callback() };
+ };
+ break;
+ }
+ buttonlist[0] = {
+ text: t('core', 'Ok'),
+ click: functionToCall
+ };
+ break;
+ };
- $(dialog_id).dialog({
- width: (4/9) * $(document).width(),
- height: 180,
- modal: modal,
- buttons: buttonlist
+ $(dialog_id).dialog({
+ modal: modal,
+ buttons: buttonlist
+ });
+ OCdialogs.dialogs_counter++;
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file picker template'));
});
- OCdialogs.dialogs_counter++;
},
// dialog button types
YES_NO_BUTTONS: 70,
OK_BUTTONS: 71,
- // dialogs types
- ALERT_DIALOG: 80,
- INFO_DIALOG: 81,
- FORM_DIALOG: 82,
// used to name each dialog
dialogs_counter: 0,
@@ -278,7 +322,7 @@ var OCdialogs = {
prompt_ok_handler: function(callback, dialog_id) {
$(dialog_id).dialog('close');
- if (callback !== undefined) { callback($(dialog_id + " input#oc-dialog-prompt-input").val()) };
+ if (callback !== undefined) { callback($(dialog_id + ' input#oc-dialog-prompt-input').val()) };
},
form_ok_handler: function(callback, dialog_id) {
@@ -297,8 +341,7 @@ var OCdialogs = {
* fills the filepicker with files
*/
fillFilePicker:function(request, dialog_content_id) {
- var template_content = '<img src="*MIMETYPEICON*" style="margin: 2px 1em 0 4px;"><span class="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div>';
- var template = '<div data-entryname="*ENTRYNAME*" data-dcid="' + escapeHTML(dialog_content_id) + '" data="*ENTRYTYPE*">*CONTENT*</div>';
+ var $filelist = $(dialog_content_id + ' #filelist').empty();
var files = '';
var dirs = [];
var others = [];
@@ -309,14 +352,24 @@ var OCdialogs = {
others.push(file);
}
});
+
var sorted = dirs.concat(others);
- for (var i = 0; i < sorted.length; i++) {
- files_content = template_content.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon);
- files += template.replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)).replace('*CONTENT*', files_content);
- }
- $(dialog_content_id + ' #filelist').html(files);
- $('#filelist div').click(function() {
+ var self = this;
+ $.each(sorted, function(idx, entry) {
+ $li = self.$listTmpl.octemplate({
+ type: entry.type,
+ dcid: dialog_content_id,
+ imgsrc: entry.mimetype_icon,
+ filename: entry.name,
+ date: OC.mtime2date(entry.mtime)
+ });
+ $filelist.append($li);
+ });
+
+ $filelist.removeClass('loading');
+
+ $filelist.on('click', 'li', function() {
OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
});
@@ -326,24 +379,29 @@ var OCdialogs = {
* fills the tree list with directories
*/
fillTreeList: function(request, dialog_id) {
- var template = '<option value="*COUNT*">*NAME*</option>';
- var paths = '<option value="0">' + escapeHTML($(dialog_id).data('path')) + '</option>';
+ var $dirtree = $(dialog_id + ' #dirtree').empty();
+ var $template = $('<option value="{count}">{name}</option>');
+ $dirtree.append($template.octemplate({
+ count: 0,
+ name: $(dialog_id).data('path')
+ }));
$.each(request.data, function(index, file) {
- paths += template.replace('*COUNT*', index).replace('*NAME*', escapeHTML(file.name));
+ $dirtree.append($template.octemplate({
+ count: index,
+ name: file.name
+ }));
});
-
- $(dialog_id + ' #dirtree').html(paths);
},
/**
* handle selection made in the tree list
*/
handleTreeListSelect:function(event) {
- if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
- $(event.data.dcid).data('path', $("option:selected", this).html());
+ if ($('option:selected', this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
+ $(event.data.dcid).data('path', $('option:selected', this).html());
} else {
- $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $("option:selected", this).html() + '/');
+ $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $('option:selected', this).html() + '/');
}
- $(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible');
+ $(event.data.dcid).find('#filelist').addClass('loading');
$.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
{
@@ -356,7 +414,7 @@ var OCdialogs = {
OC.filePath('files', 'ajax', 'rawlist.php'),
{
dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
+ mimetype: 'httpd/unix-directory'
},
function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
);
@@ -366,13 +424,13 @@ var OCdialogs = {
*/
filepickerDirUp:function(event) {
var old_path = $(event.data.dcid).data('path');
- if ( old_path !== "/") {
+ if ( old_path !== '/') {
var splitted_path = old_path.split("/");
var new_path = ""
for (var i = 0; i < splitted_path.length - 2; i++) {
- new_path += splitted_path[i] + "/"
+ new_path += splitted_path[i] + '/'
}
- $(event.data.dcid).data('path', new_path);
+ $(event.data.dcid).data('path', new_path).find('#filelist').empty().addClass('loading');;
$.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
{
@@ -385,7 +443,7 @@ var OCdialogs = {
OC.filePath('files', 'ajax', 'rawlist.php'),
{
dir: $(event.data.dcid).data('path'),
- mimetype: "httpd/unix-directory"
+ mimetype: 'httpd/unix-directory'
},
function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
);
@@ -395,16 +453,16 @@ var OCdialogs = {
* handle clicks made in the filepicker
*/
handlePickerClick:function(element, name, dialog_content_id) {
- if ( $(element).attr('data') === 'file' ){
+ if ( $(element).data('type') === 'file' ){
if ( $(dialog_content_id).data('multiselect') !== true) {
$(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected');
}
$(element).toggleClass('filepicker_element_selected');
return;
- } else if ( $(element).attr('data') === 'dir' ) {
+ } else if ( $(element).data('type') === 'dir' ) {
var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' );
$(dialog_content_id).data('path', datapath);
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible');
+ $(dialog_content_id).find('#filelist').empty().addClass('loading');
$.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
{
@@ -417,7 +475,7 @@ var OCdialogs = {
OC.filePath('files', 'ajax', 'rawlist.php'),
{
dir: datapath,
- mimetype: "httpd/unix-directory"
+ mimetype: 'httpd/unix-directory'
},
function(request) { OCdialogs.fillTreeList(request, dialog_content_id) }
);
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
new file mode 100644
index 0000000000..f29de390ef
--- /dev/null
+++ b/core/templates/filepicker.html
@@ -0,0 +1,11 @@
+<div id="{dialog_name}" title="{title}">
+ <button id="dirup">↑</button>
+ <select id="dirtree"></select>
+ <ul id="filelist">
+ <li data-entryname="{filename}" data-type="{type}" data-dcid="{dcid}">
+ <img src="{imgsrc}" />
+ <span class="filename">{filename}</span>
+ <span class="date">{date}</span>
+ </li>
+ </ul>
+</div>
diff --git a/core/templates/message.html b/core/templates/message.html
new file mode 100644
index 0000000000..59048100f3
--- /dev/null
+++ b/core/templates/message.html
@@ -0,0 +1,3 @@
+<div id="{dialog_name}" title="{title}">
+ <p><span class="ui-icon ui-icon-{type}"></span>{message}</p>
+</div>
diff --git a/lib/base.php b/lib/base.php
index 667202d3ae..2e2cee97eb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -260,6 +260,7 @@ class OC {
OC_Util::addScript("jquery-tipsy");
OC_Util::addScript("compatibility");
OC_Util::addScript("oc-dialogs");
+ OC_Util::addScript("octemplate");
OC_Util::addScript("js");
OC_Util::addScript("eventsource");
OC_Util::addScript("config");
--
GitLab
From 9d1e60325c6f478484ff8f70ff3cd13d9d7d4913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 16 May 2013 14:53:04 +0200
Subject: [PATCH 204/304] allow admin to recover users files in case of
password lost
---
apps/files_encryption/hooks/hooks.php | 73 ++++++++++++++-----
apps/files_encryption/js/settings-admin.js | 2 +-
apps/files_encryption/lib/helper.php | 2 +-
apps/files_encryption/lib/util.php | 84 +++++++++++++++++++++-
lib/user.php | 7 +-
settings/ajax/changepassword.php | 5 +-
settings/css/settings.css | 2 +
settings/js/users.js | 4 +-
settings/templates/personal.php | 2 +-
settings/templates/users.php | 5 ++
settings/users.php | 3 +
11 files changed, 159 insertions(+), 30 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index f843c7027d..0af0845d7c 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -142,32 +142,67 @@ class Hooks {
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
- public static function setPassphrase( $params ) {
-
+ public static function setPassphrase($params) {
+
// Only attempt to change passphrase if server-side encryption
// is in use (client-side encryption does not have access to
// the necessary keys)
- if ( Crypt::mode() == 'server' ) {
+ if (Crypt::mode() == 'server') {
- $view = new \OC_FilesystemView( '/' );
+ if ($params['uid'] == \OCP\User::getUser()) {
- $session = new Session($view);
-
- // Get existing decrypted private key
- $privateKey = $session->getPrivateKey();
-
- // Encrypt private key with new user pwd as passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
-
- // Save private key
- Keymanager::setPrivateKey( $encryptedPrivateKey );
-
- // NOTE: Session does not need to be updated as the
- // private key has not changed, only the passphrase
- // used to decrypt it has changed
+ $view = new \OC_FilesystemView('/');
+
+ $session = new Session($view);
+
+ // Get existing decrypted private key
+ $privateKey = $session->getPrivateKey();
+
+ // Encrypt private key with new user pwd as passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($privateKey, $params['password']);
+
+ // Save private key
+ Keymanager::setPrivateKey($encryptedPrivateKey);
+
+ // NOTE: Session does not need to be updated as the
+ // private key has not changed, only the passphrase
+ // used to decrypt it has changed
+
+ } else { // admin changed the password for a different user, create new keys and reencrypt file keys
+
+ $user = $params['uid'];
+ $recoveryPassword = $params['recoveryPassword'];
+ $newUserPassword = $params['password'];
+
+ $view = new \OC_FilesystemView('/');
+
+ // make sure that the users home is mounted
+ \OC\Files\Filesystem::initMountPoints($user);
+
+ $keypair = Crypt::createKeypair();
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+ $view->file_put_contents( '/public-keys/'.$user.'.public.key', $keypair['publicKey'] );
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $newUserPassword );
+
+ // Save private key
+ $view->file_put_contents( '/'.$user.'/files_encryption/'.$user.'.private.key', $encryptedPrivateKey );
+
+ if ( $recoveryPassword ) { // if recovery key is set we can re-encrypt the key files
+ $util = new Util($view, $user);
+ $util->recoverUsersFiles($recoveryPassword);
+ }
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
-
}
/*
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 9bc6ab6433..dbae42b011 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -69,7 +69,7 @@ $(document).ready(function(){
}
);
- // change password
+ // change recovery password
$('input:password[name="changeRecoveryPassword"]').keyup(function(event) {
var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 6d5aae4e8b..86d860465e 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -46,7 +46,7 @@ class Helper {
public static function registerUserHooks() {
\OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
- \OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+ \OCP\Util::connectHook( 'OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
\OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
\OCP\Util::connectHook( 'OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser' );
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 91d86cc855..fab807b014 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -929,7 +929,7 @@ class Util {
// Get the current users's private key for decrypting existing keyfile
$privateKey = $session->getPrivateKey();
-
+
$fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
// Decrypt keyfile
@@ -1336,7 +1336,7 @@ class Util {
}
}
- /**
+ /**
* @brief remove recovery key to all encrypted files
*/
public function removeRecoveryKeys($path = '/') {
@@ -1351,4 +1351,84 @@ class Util {
}
}
}
+
+ /**
+ * @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
+ * @param type $file
+ * @param type $privateKey recovery key to decrypt the file
+ */
+ private function recoverFile($file, $privateKey) {
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // Find out who, if anyone, is sharing the file
+ if ($sharingEnabled) {
+ $result = \OCP\Share::getUsersSharingFile($file, $this->userId, true, true, true);
+ $userIds = $result['users'];
+ $userIds[] = $this->recoveryKeyId;
+ if ($result['public']) {
+ $userIds[] = $this->publicShareKeyId;
+ }
+ } else {
+ $userIds = array($this->userId, $this->recoveryKeyId);
+ }
+ $filteredUids = $this->filterShareReadyUsers($userIds);
+
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ //decrypt file key
+ $encKeyfile = $this->view->file_get_contents($this->keyfilesPath.$file.".key");
+ $shareKey = $this->view->file_get_contents($this->shareKeysPath.$file.".".$this->recoveryKeyId.".shareKey");
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+ // encrypt file key again to all users, this time with the new public key for the recovered use
+ $userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+ $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+
+ // write new keys to filesystem TDOO!
+ $this->view->file_put_contents($this->keyfilesPath.$file.'.key', $multiEncKey['data']);
+ foreach ($multiEncKey['keys'] as $userId => $shareKey) {
+ $shareKeyPath = $this->shareKeysPath.$file.'.'.$userId.'.shareKey';
+ $this->view->file_put_contents($shareKeyPath, $shareKey);
+ }
+
+ // Return proxy to original status
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
+ /**
+ * @brief collect all files and recover them one by one
+ * @param type $path to look for files keys
+ * @param type $privateKey private recovery key which is used to decrypt the files
+ */
+ private function recoverAllFiles($path, $privateKey) {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+ foreach ($dirContent as $item) {
+ $filePath = substr($item['path'], 25);
+ if ($item['type'] == 'dir') {
+ $this->addRecoveryKey($filePath . '/', $privateKey);
+ } else {
+ $file = substr($filePath, 0, -4);
+ $this->recoverFile($file, $privateKey);
+ }
+ }
+ }
+
+ /**
+ * @brief recover users files in case of password lost
+ * @param type $recoveryPassword
+ */
+ public function recoverUsersFiles($recoveryPassword) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/'.$this->recoveryKeyId.'.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $recoveryPassword );
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $this->recoverAllFiles('/', $privateKey);
+ }
}
diff --git a/lib/user.php b/lib/user.php
index 226b716188..833e886659 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -393,13 +393,14 @@ class OC_User {
* @brief Set password
* @param $uid The username
* @param $password The new password
+ * @param $recoveryPassword for the encryption app to reset encryption keys
* @returns true/false
*
* Change the password of a user
*/
- public static function setPassword( $uid, $password ) {
+ public static function setPassword( $uid, $password, $recoveryPassword = null ) {
$run = true;
- OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
+ OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword ));
if( $run ) {
$success = false;
@@ -412,7 +413,7 @@ class OC_User {
}
// invalidate all login cookies
OC_Preferences::deleteApp($uid, 'login_token');
- OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password ));
+ OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword ));
return $success;
}
else{
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 4f16bff63d..fe63f27a6e 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,8 +8,9 @@ OC_JSON::checkLoggedIn();
OC_APP::loadApps();
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = isset($_POST["newpassword"]) ? $_POST["newpassword"] : null;
+$password = isset($_POST["password"]) ? $_POST["password"] : null;
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
+$recoveryPassword=isset($_POST["recoveryPassword"])?$_POST["recoveryPassword"]:null;
$userstatus = null;
if(OC_User::isAdminUser(OC_User::getUser())) {
@@ -28,7 +29,7 @@ if(is_null($userstatus)) {
}
// Return Success story
-if(!is_null($password) && OC_User::setPassword( $username, $password )) {
+if(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
else{
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 46a0bbe7c3..950e892901 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -45,6 +45,8 @@ table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; }
div.quota { float:right; display:block; position:absolute; right:25em; top:-1px; }
div.quota-select-wrapper { position: relative; }
+div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
+input#recoveryPassword {width:15em;}
select.quota { position:absolute; left:0; top:0; width:10em; }
select.quota-user { position:relative; left:0; top:0; width:10em; }
div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 690c9ad046..9bd7f31f0b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -351,9 +351,11 @@ $(document).ready(function () {
input.keypress(function (event) {
if (event.keyCode == 13) {
if ($(this).val().length > 0) {
+ var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
+ console.log("RECOVERY PASSWD: " + recoveryPasswordVal);
$.post(
OC.filePath('settings', 'ajax', 'changepassword.php'),
- {username: uid, password: $(this).val()},
+ {username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
}
);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index cfb45e99c4..da812e8ed9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -38,7 +38,7 @@ if($_['passwordChangeSupported']) {
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
- <input type="password" id="pass2" name="newpassword"
+ <input type="password" id="pass2" name="password"
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e86dd46efb..a6df85983d 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -29,6 +29,11 @@ $_['subadmingroups'] = array_flip($items);
<?php endforeach;?>
</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
</form>
+ <?php if((bool)$_['recoveryAdminEnabled']): ?>
+ <div class="recoveryPassword">
+ <input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" />
+ </div>
+ <?php endif; ?>
<div class="quota">
<span><?php p($l->t('Default Storage'));?></span>
<?php if((bool) $_['isadmin']): ?>
diff --git a/settings/users.php b/settings/users.php
index 94e6d0a9a1..e5c8a7aaa8 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -20,6 +20,8 @@ $users = array();
$groups = array();
$isadmin = OC_User::isAdminUser(OC_User::getUser());
+$recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
+ OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
if($isadmin) {
$accessiblegroups = OC_Group::getGroups();
@@ -77,4 +79,5 @@ $tmpl->assign( 'numofgroups', count($accessiblegroups));
$tmpl->assign( 'quota_preset', $quotaPreset);
$tmpl->assign( 'default_quota', $defaultQuota);
$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
+$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
$tmpl->printPage();
--
GitLab
From 8ae30891b3cd5781741ce797b0ff99d68eab7c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 16 May 2013 15:19:53 +0200
Subject: [PATCH 205/304] some error handling in case the recovery password is
wrong
---
settings/ajax/changepassword.php | 7 +++++--
settings/js/users.js | 4 ++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index fe63f27a6e..adb730e12c 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -28,10 +28,13 @@ if(is_null($userstatus)) {
exit();
}
-// Return Success story
-if(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
+ OC_JSON::error(array("data" => array( "message" => "Wrong recovery admin password. Please check the password and try again." )));
+}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
else{
OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
}
+error_log("bliub");
diff --git a/settings/js/users.js b/settings/js/users.js
index 9bd7f31f0b..423068e51f 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -357,6 +357,10 @@ $(document).ready(function () {
OC.filePath('settings', 'ajax', 'changepassword.php'),
{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
+ if (result.status != 'success') {
+ OC.dialogs.alert(result.data.message,
+ t('settings', 'Error changing password'));
+ }
}
);
input.blur();
--
GitLab
From f1a5b8b524531567ba18c6e08a6f7110dcff18d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 16 May 2013 16:01:40 +0200
Subject: [PATCH 206/304] show nicer warning if the admin recovery password was
wrong
---
settings/ajax/changepassword.php | 2 +-
settings/js/users.js | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index adb730e12c..6b5bf9c66b 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -30,7 +30,7 @@ if(is_null($userstatus)) {
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
- OC_JSON::error(array("data" => array( "message" => "Wrong recovery admin password. Please check the password and try again." )));
+ OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
diff --git a/settings/js/users.js b/settings/js/users.js
index 423068e51f..f3fab34b09 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -351,15 +351,13 @@ $(document).ready(function () {
input.keypress(function (event) {
if (event.keyCode == 13) {
if ($(this).val().length > 0) {
- var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
- console.log("RECOVERY PASSWD: " + recoveryPasswordVal);
+ var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
$.post(
OC.filePath('settings', 'ajax', 'changepassword.php'),
{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
if (result.status != 'success') {
- OC.dialogs.alert(result.data.message,
- t('settings', 'Error changing password'));
+ OC.Notification.show(t('admin', result.data.message));
}
}
);
@@ -374,6 +372,10 @@ $(document).ready(function () {
img.css('display', '');
});
});
+ $('input:password[id="recoveryPassword"]').keyup(function(event) {
+ OC.Notification.hide();
+ });
+
$('table').on('click', 'td.password', function (event) {
$(this).children('img').click();
});
--
GitLab
From 95297c246970f5e185b94cbc320b28d88a7c0d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 16 May 2013 17:44:28 +0200
Subject: [PATCH 207/304] add pre-shared hooks
---
lib/public/share.php | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/lib/public/share.php b/lib/public/share.php
index b2eeb29234..e1538152d8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1207,6 +1207,17 @@ class Share {
if ($shareType == self::SHARE_TYPE_GROUP) {
$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
$uidOwner, $suggestedItemTarget);
+ \OC_Hook::emit('OCP\Share', 'pre_shared', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $groupItemTarget,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith['group'],
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'fileSource' => $fileSource,
+ 'token' => $token
+ ));
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
@@ -1282,6 +1293,17 @@ class Share {
} else {
$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
$suggestedItemTarget);
+ \OC_Hook::emit('OCP\Share', 'pre_shared', array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $itemTarget,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith,
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'fileSource' => $fileSource,
+ 'token' => $token
+ ));
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
--
GitLab
From 913941d894579ed332169a7573654fd6b0ca9eca Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 16 May 2013 18:19:28 +0200
Subject: [PATCH 208/304] Line length etc.
---
core/js/oc-dialogs.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index c0c035bafd..8989738287 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -1,7 +1,7 @@
/**
* ownCloud
*
- * @author Bartek Przybylski,Christopher Schäpers, Thomas Tanghus
+ * @author Bartek Przybylski, Christopher Schäpers, Thomas Tanghus
* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
*
* This library is free software; you can redistribute it and/or
@@ -396,7 +396,8 @@ var OCdialogs = {
* handle selection made in the tree list
*/
handleTreeListSelect:function(event) {
- if ($('option:selected', this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
+ // if there's a slash in the selected path, don't append it
+ if ($('option:selected', this).html().indexOf('/') !== -1) {
$(event.data.dcid).data('path', $('option:selected', this).html());
} else {
$(event.data.dcid).data('path', $(event.data.dcid).data('path') + $('option:selected', this).html() + '/');
--
GitLab
From d40d6aa3581fdacfc10532cfcfc2dc20835817d1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 22:39:09 +0200
Subject: [PATCH 209/304] fix typo in addRecoveryKeys
---
apps/files_encryption/lib/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index fab807b014..038ec78bbd 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1325,7 +1325,7 @@ class Util {
foreach ($dirContent as $item) {
$filePath = substr($item['path'], 25);
if ($item['type'] == 'dir') {
- $this->addRecoveryKey($filePath.'/');
+ $this->addRecoveryKeys($filePath.'/');
} else {
$session = new Session(new \OC_FilesystemView('/'));
$sharingEnabled = \OCP\Share::isEnabled();
--
GitLab
From 3793e4d2d6729f01a83c56d8f123226134f8c626 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 16 May 2013 22:57:55 +0200
Subject: [PATCH 210/304] fix for recover files in subfolder
---
apps/files_encryption/lib/util.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 038ec78bbd..7acb3ce2dc 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1406,7 +1406,7 @@ class Util {
foreach ($dirContent as $item) {
$filePath = substr($item['path'], 25);
if ($item['type'] == 'dir') {
- $this->addRecoveryKey($filePath . '/', $privateKey);
+ $this->recoverAllFiles($filePath . '/', $privateKey);
} else {
$file = substr($filePath, 0, -4);
$this->recoverFile($file, $privateKey);
--
GitLab
From 42b4963dd010830d1a99666052ee2bfc7295249a Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 00:58:41 +0200
Subject: [PATCH 211/304] moved enable and disable recovery to Helper class for
unit tests
---
apps/files_encryption/ajax/adminrecovery.php | 64 +-------------
apps/files_encryption/lib/helper.php | 92 ++++++++++++++++++++
2 files changed, 94 insertions(+), 62 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 0ab449709c..dc13bc57c1 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -21,74 +21,14 @@ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
- $view = new \OC\Files\View('/');
-
- if ($recoveryKeyId === null) {
- $recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
- \OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
- }
-
- if (!$view->is_dir('/owncloud_private_key')) {
- $view->mkdir('/owncloud_private_key');
- }
-
- if (
- (!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
- || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
- ) {
-
- $keypair = \OCA\Encryption\Crypt::createKeypair();
-
- \OC_FileProxy::$enabled = false;
-
- // Save public key
-
- if (!$view->is_dir('/public-keys')) {
- $view->mkdir('/public-keys');
- }
-
- $view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
-
- // Encrypt private key empthy passphrase
- $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $_POST['recoveryPassword']);
-
- // Save private key
- $view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
-
- // create control file which let us check later on if the entered password was correct.
- $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
- if (!$view->is_dir('/control-file')) {
- $view->mkdir('/control-file');
- }
- $view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
-
- \OC_FileProxy::$enabled = true;
-
- // Set recoveryAdmin as enabled
- OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
-
- $return = true;
-
- } else { // get recovery key and check the password
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
- $return = $util->checkRecoveryPassword($_POST['recoveryPassword']);
- if ($return) {
- OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
- }
- }
+ $return = \Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
// Disable recoveryAdmin
} elseif (
isset($_POST['adminEnableRecovery'])
&& 0 == $_POST['adminEnableRecovery']
) {
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
- $return = $util->checkRecoveryPassword($_POST['recoveryPassword']);
-
- if ($return) {
- // Set recoveryAdmin as disabled
- OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
- }
+ $return = \Helper::adminDisableRecovery($_POST['recoveryPassword']);
}
// Return success or failure
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 86d860465e..a04c65e251 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -26,6 +26,10 @@ namespace OCA\Encryption;
/**
* @brief Class to manage registration of hooks an various helper methods
*/
+/**
+ * Class Helper
+ * @package OCA\Encryption
+ */
class Helper {
/**
@@ -89,4 +93,92 @@ class Helper {
return true;
}
+
+ /**
+ * @brief enable recovery
+ *
+ * @param $recoveryKeyId
+ * @param $recoveryPassword
+ * @internal param \OCA\Encryption\Util $util
+ * @internal param string $password
+ * @return bool
+ */
+ public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
+ $view = new \OC\Files\View('/');
+
+ if ($recoveryKeyId === null) {
+ $recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
+ \OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
+ }
+
+ if (!$view->is_dir('/owncloud_private_key')) {
+ $view->mkdir('/owncloud_private_key');
+ }
+
+ if (
+ (!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
+ || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
+ ) {
+
+ $keypair = \OCA\Encryption\Crypt::createKeypair();
+
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
+ $view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
+
+ // Save private key
+ $view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
+
+ // create control file which let us check later on if the entered password was correct.
+ $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
+ if (!$view->is_dir('/control-file')) {
+ $view->mkdir('/control-file');
+ }
+ $view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
+
+ \OC_FileProxy::$enabled = true;
+
+ // Set recoveryAdmin as enabled
+ \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+
+ $return = true;
+
+ } else { // get recovery key and check the password
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $return = $util->checkRecoveryPassword($_POST['recoveryPassword']);
+ if ($return) {
+ \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+ }
+ }
+
+ return $return;
+ }
+
+
+ /**
+ * @brief disable recovery
+ *
+ * @param $recoveryPassword
+ * @return bool
+ */
+ public static function adminDisableRecovery($recoveryPassword) {
+ $util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $return = $util->checkRecoveryPassword($recoveryPassword);
+
+ if ($return) {
+ // Set recoveryAdmin as disabled
+ \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
+ }
+
+ return $return;
+ }
}
\ No newline at end of file
--
GitLab
From a4c0eb17569457784faa06ed0b65a319f7ec2f78 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 01:07:26 +0200
Subject: [PATCH 212/304] improved tests
---
apps/files_encryption/tests/crypt.php | 17 +++++++++++++++-
apps/files_encryption/tests/keymanager.php | 23 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 1caa9ea7da..bfb5ca0ec8 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -62,8 +62,17 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Filesystem related hooks
\OCA\Encryption\Helper::registerFilesystemHooks();
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerUserHooks();
+
\OC_FileProxy::register(new OCA\Encryption\Proxy());
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
@@ -78,6 +87,13 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
function tearDown() {
\OC_FileProxy::clearProxies();
+
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
}
function testGenerateKey() {
@@ -686,7 +702,6 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $newDecrypt );
// tear down
- $view->unlink( $newFolder . '/' . $newFilename );
$view->unlink( $newFolder );
}
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 28452d779c..3f6b936373 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -57,6 +57,12 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::register(new OCA\Encryption\Proxy());
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
@@ -72,6 +78,13 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::$enabled = true;
\OC_FileProxy::clearProxies();
+
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
}
function testGetPrivateKey() {
@@ -116,6 +129,16 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
Encryption\Keymanager::setFileKey( $this->view, $file, $this->userId, $key['key'] );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // cleanup
+ $this->view->unlink('/'.$this->userId . '/files/' . $file);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
}
--
GitLab
From 2b0bf4dc87a1117de5b2a6c0201f35736b80f0e7 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 01:07:50 +0200
Subject: [PATCH 213/304] added tests for recovery
---
apps/files_encryption/tests/share.php | 144 +++++++++++++++++++++++++-
1 file changed, 142 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index e5427fdf50..a40a992b80 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -528,12 +528,152 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
}
- function loginHelper($user, $create = false)
+ function testRecoveryFile()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // check if control file created
+ $this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
+
+ // check if recovery password match
+ $this->assertTrue($util->checkRecoveryPassword('test123'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(true));
+
+ // create folder structure
+ $this->view->mkdir('/admin/files' . $this->folder1);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile1));
+ $this->assertTrue(is_int($cryptedFile2));
+
+ // check if share key for admin and recovery exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.admin.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+
+ // disable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(false));
+
+ // remove all recovery keys
+ $util->removeRecoveryKeys('/');
+
+ // check if share key for recovery not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(true));
+
+ // remove all recovery keys
+ $util->addRecoveryKeys('/');
+
+ // check if share key for admin and recovery exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+ $this->view->unlink('/admin/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename);
+
+ // check if share key for recovery not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ }
+
+ function testRecoveryForUser()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // check if control file created
+ $this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+
+ // login as user1
+ $this->loginHelper('user1');
+
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'user1');
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(true));
+
+ // create folder structure
+ $this->view->mkdir('/user1/files' . $this->folder1);
+ $this->view->mkdir('/user1/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/user1/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+
+ // save file with content
+ $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile1));
+ $this->assertTrue(is_int($cryptedFile2));
+
+ // check if share key for user and recovery exists
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.user1.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // change password
+ \OC_User::setPassword('user1', 'test', 'test123');
+
+ // login as user1
+ $this->loginHelper('user1', false, 'test');
+
+ // get file contents
+ $retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
+ $retrievedCryptedFile2 = file_get_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename);
+
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile1);
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile2);
+
+ // cleanup
+ $this->view->unlink('/user1/files' . $this->folder1);
+ $this->view->unlink('/user1/files' . $this->filename);
+
+ // check if share key for user and recovery exists
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+
+ // enable recovery for admin
+ $this->assertTrue($util->setRecoveryForUser(false));
+ }
+
+ function loginHelper($user, $create = false, $password = false)
{
if ($create) {
\OC_User::createUser($user, $user);
}
+ if($password === false) {
+ $password = $user;
+ }
+
\OC_Util::tearDownFS();
\OC_User::setUserId('');
\OC\Files\Filesystem::tearDown();
@@ -541,7 +681,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
\OC_User::setUserId($user);
$params['uid'] = $user;
- $params['password'] = $user;
+ $params['password'] = $password;
OCA\Encryption\Hooks::login($params);
}
}
--
GitLab
From d7dc710c8b1d46947cb2afe13152e0adc9ee5594 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 01:17:55 +0200
Subject: [PATCH 214/304] revert changes
---
lib/public/share.php | 53 +++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/lib/public/share.php b/lib/public/share.php
index e1538152d8..03d662676c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1541,34 +1541,31 @@ class Share {
}
public static function post_addToGroup($arguments) {
-
- if(\OC_Config::getValue('installed')) {
- // Find the group shares and check if the user needs a unique target
- $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
- $result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
- $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
- .' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
- .' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
- while ($item = $result->fetchRow()) {
- if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
- $itemTarget = null;
- } else {
- $itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
- $arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
- }
- if (isset($item['file_source'])) {
- $fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
- $arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
- } else {
- $fileTarget = null;
- }
- // Insert an extra row for the group share if the item or file target is unique for this user
- if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
- $query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
- self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
- $item['stime'], $item['file_source'], $fileTarget));
- \OC_DB::insertid('*PREFIX*share');
- }
+ // Find the group shares and check if the user needs a unique target
+ $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
+ $result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
+ .' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
+ .' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+ while ($item = $result->fetchRow()) {
+ if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
+ $itemTarget = null;
+ } else {
+ $itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
+ $arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
+ }
+ if (isset($item['file_source'])) {
+ $fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
+ $arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
+ } else {
+ $fileTarget = null;
+ }
+ // Insert an extra row for the group share if the item or file target is unique for this user
+ if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
+ $query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
+ self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
+ $item['stime'], $item['file_source'], $fileTarget));
+ \OC_DB::insertid('*PREFIX*share');
}
}
}
--
GitLab
From 152e275c8a780c220c5022ef059dd7b12adc7cf1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 May 2013 04:54:08 +0200
Subject: [PATCH 215/304] Various cleanups in OC.dialogs
---
apps/files/ajax/rawlist.php | 8 ++
core/css/styles.css | 15 ++-
core/js/oc-dialogs.js | 235 ++++++++++++++-------------------
core/templates/filepicker.html | 8 +-
4 files changed, 118 insertions(+), 148 deletions(-)
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 1cd2944483..f568afad4d 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -15,6 +15,14 @@ $mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
// make filelist
$files = array();
+// If a type other than directory is requested first load them.
+if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) {
+ $i["date"] = OCP\Util::formatDate($i["mtime"] );
+ $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
+ $files[] = $i;
+ }
+}
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) {
$i["date"] = OCP\Util::formatDate($i["mtime"] );
$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
diff --git a/core/css/styles.css b/core/css/styles.css
index ee00196d66..2038417685 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -382,13 +382,14 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
/* ---- DIALOGS ---- */
-#dirup {width:4%;}
-#dirtree {width:92%;}
-#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
-#filelist img { margin: 2px 1em 0 4px; }
-#filelist .date { float:right;margin-right:1em; }
-.filepicker_element_selected { background-color:lightblue;}
-.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;}
+#oc-dialog-filepicker-content .dirup {width:4%; font-weight: bold;}
+#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; font-weight: bold; }
+#oc-dialog-filepicker-content .dirtree span { cursor: pointer; }
+#oc-dialog-filepicker-content .dirtree span:not(last-child)::after { content: '>'; padding: 3px;}
+#oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
+#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
+#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
+#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 8989738287..4da9623c0a 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -133,7 +133,7 @@ var OCdialogs = {
var self = this;
$.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
self.$filePickerTemplate = $(tmpl);
- self.$listTmpl = self.$filePickerTemplate.find('#filelist li:first-child').detach();
+ self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
defer.resolve(self.$filePickerTemplate);
})
.fail(function() {
@@ -160,6 +160,12 @@ var OCdialogs = {
}
return defer.promise();
},
+ _getFileList: function(dir, mimeType) {
+ return $.getJSON(
+ OC.filePath('files', 'ajax', 'rawlist.php'),
+ {dir: dir, mimetype: mimeType}
+ );
+ },
/**
* show a file picker to pick a file from
* @param title dialog title
@@ -169,35 +175,35 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
filepicker:function(title, callback, multiselect, mimetype_filter, modal) {
+ var self = this;
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+ var dialog_name = 'oc-dialog-filepicker-content';
var dialog_id = '#' + dialog_name;
- var $dlg = $tmpl.octemplate({
+ if(self.$filePicker) {
+ self.$filePicker.dialog('close');
+ }
+ self.$filePicker = $tmpl.octemplate({
dialog_name: dialog_name,
title: title
- }).data('path', '/');
+ }).data('path', '');
if (modal === undefined) { modal = false };
if (multiselect === undefined) { multiselect = false };
if (mimetype_filter === undefined) { mimetype_filter = '' };
- $('body').append($dlg);
+ $('body').append(self.$filePicker);
- $dlg.find('#dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
- $dlg.find('#dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
- $dlg.find('#filelist').empty().addClass('loading');
- $dlg.ready(function(){
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'),
- {mimetype: mimetype_filter},
- function(response) {
- OCdialogs.fillFilePicker(response, dialog_id);
- });
- $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'),
- {mimetype: 'httpd/unix-directory'},
- function(response) {
- OCdialogs.fillTreeList(response, dialog_id);
+ self.$filePicker.ready(function() {
+ self.$filelist = self.$filePicker.find('.filelist');
+ self.$dirUp = self.$filePicker.find('.dirup');
+ self.$dirTree = self.$filePicker.find('.dirtree');
+ self.$dirTree.on('click', 'span', self, self.handleTreeListSelect);
+ self.$dirUp.click(self, self.filepickerDirUp);
+ self.$filelist.on('click', 'li', function(event) {
+ self.handlePickerClick(event, $(this));
});
+ self.fillFilePicker('');
}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
// build buttons
@@ -206,15 +212,15 @@ var OCdialogs = {
var datapath;
if (multiselect === true) {
datapath = [];
- $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
- datapath.push( $(dialog_id).data('path') + $(element).text() );
+ self.$filelist.find('.filepicker_element_selected .filename').each(function(index, element) {
+ datapath.push(self.$filePicker.data('path') + '/' + $(element).text());
});
} else {
- var datapath = $(dialog_id).data('path');
- datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+ var datapath = self.$filePicker.data('path');
+ datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text();
}
callback(datapath);
- $(dialog_id).dialog('close');
+ self.$filePicker.dialog('close');
}
};
var buttonlist = [{
@@ -223,16 +229,19 @@ var OCdialogs = {
},
{
text: t('core', 'Cancel'),
- click: function(){$(dialog_id).dialog('close'); }
+ click: function(){self.$filePicker.dialog('close'); }
}];
- $(dialog_id).dialog({
+ self.$filePicker.dialog({
width: (4/9)*$(document).width(),
height: 420,
modal: modal,
- buttons: buttonlist
+ buttons: buttonlist,
+ close: function(event, ui) {
+ self.$filePicker.dialog('destroy').remove();
+ self.$filePicker = null;
+ }
});
- OCdialogs.dialogs_counter++;
})
.fail(function() {
alert(t('core', 'Error loading file picker template'));
@@ -340,146 +349,98 @@ var OCdialogs = {
/**
* fills the filepicker with files
*/
- fillFilePicker:function(request, dialog_content_id) {
- var $filelist = $(dialog_content_id + ' #filelist').empty();
- var files = '';
+ fillFilePicker:function(dir) {
var dirs = [];
var others = [];
- $.each(request.data, function(index, file) {
- if (file.type === 'dir') {
- dirs.push(file);
- } else {
- others.push(file);
- }
- });
-
- var sorted = dirs.concat(others);
-
var self = this;
- $.each(sorted, function(idx, entry) {
- $li = self.$listTmpl.octemplate({
- type: entry.type,
- dcid: dialog_content_id,
- imgsrc: entry.mimetype_icon,
- filename: entry.name,
- date: OC.mtime2date(entry.mtime)
+ this.$filelist.empty().addClass('loading');
+ this.$filePicker.data('path', dir);
+ $.when(this._getFileList(dir, this.$filePicker.data('mimetype'))).then(function(response) {
+ $.each(response.data, function(index, file) {
+ if (file.type === 'dir') {
+ dirs.push(file);
+ } else {
+ others.push(file);
+ }
});
- $filelist.append($li);
- });
- $filelist.removeClass('loading');
+ self.fillTreeList();
+ var sorted = dirs.concat(others);
- $filelist.on('click', 'li', function() {
- OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
- });
+ $.each(sorted, function(idx, entry) {
+ $li = self.$listTmpl.octemplate({
+ type: entry.type,
+ dir: dir,
+ imgsrc: entry.mimetype_icon,
+ filename: entry.name,
+ date: OC.mtime2date(entry.mtime)
+ });
+ self.$filelist.append($li);
+ });
- $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
+ self.$filelist.removeClass('loading');
+ });
},
/**
* fills the tree list with directories
*/
- fillTreeList: function(request, dialog_id) {
- var $dirtree = $(dialog_id + ' #dirtree').empty();
- var $template = $('<option value="{count}">{name}</option>');
- $dirtree.append($template.octemplate({
- count: 0,
- name: $(dialog_id).data('path')
- }));
- $.each(request.data, function(index, file) {
- $dirtree.append($template.octemplate({
- count: index,
- name: file.name
+ fillTreeList: function() {
+ this.$dirTree.empty();
+ var self = this
+ var path = this.$filePicker.data('path');
+ if(!path) {
+ return;
+ }
+ var $template = $('<span data-dir="{dir}">{name}</span>');
+ var paths = path.split('/');
+ paths.pop();
+ $.each(paths, function(index, dir) {
+ var dir = paths.pop();
+ if(dir === '') {
+ return false;
+ }
+ self.$dirTree.prepend($template.octemplate({
+ dir: paths.join('/') + '/' + dir,
+ name: dir
}));
});
+ self.$dirTree.prepend($template.octemplate({
+ dir: '',
+ name: '/'
+ }));
},
/**
* handle selection made in the tree list
*/
handleTreeListSelect:function(event) {
- // if there's a slash in the selected path, don't append it
- if ($('option:selected', this).html().indexOf('/') !== -1) {
- $(event.data.dcid).data('path', $('option:selected', this).html());
- } else {
- $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $('option:selected', this).html() + '/');
- }
- $(event.data.dcid).find('#filelist').addClass('loading');
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: $(event.data.dcid).data('mimetype')
- },
- function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: 'httpd/unix-directory'
- },
- function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
- );
+ var self = event.data;
+ var dir = $(event.target).data('dir');
+ self.fillFilePicker(dir);
},
/**
* go one directory up
*/
filepickerDirUp:function(event) {
- var old_path = $(event.data.dcid).data('path');
- if ( old_path !== '/') {
- var splitted_path = old_path.split("/");
- var new_path = ""
- for (var i = 0; i < splitted_path.length - 2; i++) {
- new_path += splitted_path[i] + '/'
- }
- $(event.data.dcid).data('path', new_path).find('#filelist').empty().addClass('loading');;
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: $(event.data.dcid).data('mimetype')
- },
- function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: $(event.data.dcid).data('path'),
- mimetype: 'httpd/unix-directory'
- },
- function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
- );
+ var self = event.data;
+ var old_path = self.$filePicker.data('path');
+ if (old_path !== '') {
+ var splitted_path = old_path.split('/');
+ splitted_path.pop();
+ self.fillFilePicker(splitted_path.join('/'));
}
},
/**
* handle clicks made in the filepicker
*/
- handlePickerClick:function(element, name, dialog_content_id) {
- if ( $(element).data('type') === 'file' ){
- if ( $(dialog_content_id).data('multiselect') !== true) {
- $(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected');
+ handlePickerClick:function(event, $element) {
+ if ($element.data('type') === 'file') {
+ if (this.$filePicker.data('multiselect') !== true || !event.ctrlKey) {
+ this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected');
}
- $(element).toggleClass('filepicker_element_selected');
+ $element.toggleClass('filepicker_element_selected');
return;
- } else if ( $(element).data('type') === 'dir' ) {
- var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' );
- $(dialog_content_id).data('path', datapath);
- $(dialog_content_id).find('#filelist').empty().addClass('loading');
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: datapath,
- mimetype: $(dialog_content_id).data('mimetype')
- },
- function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) }
- );
- $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {
- dir: datapath,
- mimetype: 'httpd/unix-directory'
- },
- function(request) { OCdialogs.fillTreeList(request, dialog_content_id) }
- );
+ } else if ( $element.data('type') === 'dir' ) {
+ this.fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
}
}
};
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
index f29de390ef..e7aa77a732 100644
--- a/core/templates/filepicker.html
+++ b/core/templates/filepicker.html
@@ -1,8 +1,8 @@
<div id="{dialog_name}" title="{title}">
- <button id="dirup">↑</button>
- <select id="dirtree"></select>
- <ul id="filelist">
- <li data-entryname="{filename}" data-type="{type}" data-dcid="{dcid}">
+ <button class="dirup">↑</button>
+ <span class="dirtree"></span>
+ <ul class="filelist">
+ <li data-entryname="{filename}" data-type="{type}">
<img src="{imgsrc}" />
<span class="filename">{filename}</span>
<span class="date">{date}</span>
--
GitLab
From e60d86bdd1b45e29bf09bacf48bab8d847c54a72 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 May 2013 06:16:51 +0200
Subject: [PATCH 216/304] Dialogs: Make slug show last dir emphasized.
---
core/css/styles.css | 7 ++++---
core/js/oc-dialogs.js | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 2038417685..eab4e226a1 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -383,9 +383,10 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
/* ---- DIALOGS ---- */
#oc-dialog-filepicker-content .dirup {width:4%; font-weight: bold;}
-#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; font-weight: bold; }
-#oc-dialog-filepicker-content .dirtree span { cursor: pointer; }
-#oc-dialog-filepicker-content .dirtree span:not(last-child)::after { content: '>'; padding: 3px;}
+#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
+#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
#oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 4da9623c0a..8f127bfb62 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -198,7 +198,7 @@ var OCdialogs = {
self.$filelist = self.$filePicker.find('.filelist');
self.$dirUp = self.$filePicker.find('.dirup');
self.$dirTree = self.$filePicker.find('.dirtree');
- self.$dirTree.on('click', 'span', self, self.handleTreeListSelect);
+ self.$dirTree.on('click', 'span:not(:last-child)', self, self.handleTreeListSelect);
self.$dirUp.click(self, self.filepickerDirUp);
self.$filelist.on('click', 'li', function(event) {
self.handlePickerClick(event, $(this));
@@ -393,7 +393,7 @@ var OCdialogs = {
}
var $template = $('<span data-dir="{dir}">{name}</span>');
var paths = path.split('/');
- paths.pop();
+ //paths.pop();
$.each(paths, function(index, dir) {
var dir = paths.pop();
if(dir === '') {
--
GitLab
From a0b79f564944479beb497a75bb45cf02fcaf38ca Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 May 2013 06:48:24 +0200
Subject: [PATCH 217/304] Dialogs: Loose up-button.
---
core/css/styles.css | 1 -
core/js/oc-dialogs.js | 14 --------------
core/templates/filepicker.html | 1 -
3 files changed, 16 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index eab4e226a1..71b1c1fab8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -382,7 +382,6 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
/* ---- DIALOGS ---- */
-#oc-dialog-filepicker-content .dirup {width:4%; font-weight: bold;}
#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 8f127bfb62..43b698df68 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -196,10 +196,8 @@ var OCdialogs = {
self.$filePicker.ready(function() {
self.$filelist = self.$filePicker.find('.filelist');
- self.$dirUp = self.$filePicker.find('.dirup');
self.$dirTree = self.$filePicker.find('.dirtree');
self.$dirTree.on('click', 'span:not(:last-child)', self, self.handleTreeListSelect);
- self.$dirUp.click(self, self.filepickerDirUp);
self.$filelist.on('click', 'li', function(event) {
self.handlePickerClick(event, $(this));
});
@@ -417,18 +415,6 @@ var OCdialogs = {
var dir = $(event.target).data('dir');
self.fillFilePicker(dir);
},
- /**
- * go one directory up
- */
- filepickerDirUp:function(event) {
- var self = event.data;
- var old_path = self.$filePicker.data('path');
- if (old_path !== '') {
- var splitted_path = old_path.split('/');
- splitted_path.pop();
- self.fillFilePicker(splitted_path.join('/'));
- }
- },
/**
* handle clicks made in the filepicker
*/
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
index e7aa77a732..2b7942bd46 100644
--- a/core/templates/filepicker.html
+++ b/core/templates/filepicker.html
@@ -1,5 +1,4 @@
<div id="{dialog_name}" title="{title}">
- <button class="dirup">↑</button>
<span class="dirtree"></span>
<ul class="filelist">
<li data-entryname="{filename}" data-type="{type}">
--
GitLab
From 2f91606e35fb8c64e7b4c6b9eadd97813818195f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 May 2013 07:14:43 +0200
Subject: [PATCH 218/304] Dialogs: Cleanup.
---
core/js/oc-dialogs.js | 127 +++++++++---------------------------------
1 file changed, 26 insertions(+), 101 deletions(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 43b698df68..074d3656f9 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -23,6 +23,11 @@
* this class to ease the usage of jquery dialogs
*/
var OCdialogs = {
+ // dialog button types
+ YES_NO_BUTTONS: 70,
+ OK_BUTTONS: 71,
+ // used to name each dialog
+ dialogs_counter: 0,
/**
* displays alert dialog
* @param text content of dialog
@@ -31,7 +36,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
alert:function(text, title, callback, modal) {
- OCdialogs.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
+ this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays info dialog
@@ -41,7 +46,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
info:function(text, title, callback, modal) {
- OCdialogs.message(text, title, 'info', OCdialogs.OK_BUTTON, callback, modal);
+ this.message(text, title, 'info', OCdialogs.OK_BUTTON, callback, modal);
},
/**
* displays confirmation dialog
@@ -51,81 +56,7 @@ var OCdialogs = {
* @param modal make the dialog modal
*/
confirm:function(text, title, callback, modal) {
- OCdialogs.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
- },
- /**
- * prompt for user input
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses OK (input text will be passed to callback)
- * @param modal make the dialog modal
- */
- prompt:function(text, title, default_value, callback, modal) {
- var input = '<input type="text" id="oc-dialog-prompt-input" value="' + escapeHTML(default_value) + '" style="width:90%">';
- var content = '<p><span class="ui-icon ui-icon-pencil"></span>' + escapeHTML(text) + ':<br/>' + input + '</p>';
- OCdialogs.message(content, title, 'prompt', OCdialogs.OK_BUTTON, callback, modal);
- },
- /**
- * prompt user for input with custom form
- * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'default value'},...]
- * example:
- * var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hello1',value:1},{text:'hello2',value:2}] }];
- * @param fields to display
- * @param title dialog title
- * @param callback which will be triggered when user presses OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
- * @param modal make the dialog modal
- */
- form:function(fields, title, callback, modal) {
- var content = '<table>';
- $.each(fields, function(index, field){
- content += '<tr><td>' + escapeHTML(field.text) + '</td><td>';
- var type = field.type;
-
- if (type === 'text' || type === 'checkbox' || type === 'password') {
- content += '<input type="' + type + '" name="' + field.name + '"';
- if (type === 'checkbox' && field.value === true) {
- content += ' checked="checked"';
- } else if (type === 'text' || type === 'password' && val.value) {
- content += ' value="' + escapeHTML(field.value) + '"';
- }
- content += '>';
- } else if (type === 'select') {
- content += '<select name="' + escapeHTML(field.name) + '"';
- if (field.value !== undefined) {
- content += ' value="' + escapeHTML(field.value) + '"';
- }
- content += '>';
- $.each(field.options, function(index, field_option){
- content += '<option value="' + escapeHTML(field_option.value) + '">' + escapeHTML(field_option.text) + '</option>';
- });
- content += '</select>';
- }
- content += '</td></tr>';
-
- });
- content += '</table>';
-
- var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
- var dialog_id = '#' + dialog_name;
- var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
- if (modal === undefined) { modal = false };
- $('body').append(dialog_div);
- var buttonlist = [{
- text: t('core', 'Ok'),
- click: function(){ OCdialogs.form_ok_handler(callback, dialog_id); }
- },
- {
- text: t('core', 'Cancel'),
- click: function(){ $(dialog_id).dialog('close'); }
- }];
- var dialog_height = ( $('tr', dialog_div).length + 1 ) * 30 + 120;
- $(dialog_id).dialog({
- width: (4/9) * $(document).width(),
- height: dialog_height,
- modal: modal,
- buttons: buttonlist
- });
- OCdialogs.dialogs_counter++;
+ this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
},
_getFilePickerTemplate: function() {
var defer = $.Deferred();
@@ -231,6 +162,7 @@ var OCdialogs = {
}];
self.$filePicker.dialog({
+ closeOnEscape: true,
width: (4/9)*$(document).width(),
height: 420,
modal: modal,
@@ -304,6 +236,7 @@ var OCdialogs = {
};
$(dialog_id).dialog({
+ closeOnEscape: true,
modal: modal,
buttons: buttonlist
});
@@ -313,12 +246,6 @@ var OCdialogs = {
alert(t('core', 'Error loading file picker template'));
});
},
- // dialog button types
- YES_NO_BUTTONS: 70,
- OK_BUTTONS: 71,
- // used to name each dialog
- dialogs_counter: 0,
-
determineValue: function(element) {
if ( $(element).attr('type') === 'checkbox' ) {
return element.checked;
@@ -362,7 +289,7 @@ var OCdialogs = {
}
});
- self.fillTreeList();
+ self.fillSlug();
var sorted = dirs.concat(others);
$.each(sorted, function(idx, entry) {
@@ -382,27 +309,25 @@ var OCdialogs = {
/**
* fills the tree list with directories
*/
- fillTreeList: function() {
+ fillSlug: function() {
this.$dirTree.empty();
var self = this
var path = this.$filePicker.data('path');
- if(!path) {
- return;
- }
var $template = $('<span data-dir="{dir}">{name}</span>');
- var paths = path.split('/');
- //paths.pop();
- $.each(paths, function(index, dir) {
- var dir = paths.pop();
- if(dir === '') {
- return false;
- }
- self.$dirTree.prepend($template.octemplate({
- dir: paths.join('/') + '/' + dir,
- name: dir
- }));
- });
- self.$dirTree.prepend($template.octemplate({
+ if(path) {
+ var paths = path.split('/');
+ $.each(paths, function(index, dir) {
+ var dir = paths.pop();
+ if(dir === '') {
+ return false;
+ }
+ self.$dirTree.prepend($template.octemplate({
+ dir: paths.join('/') + '/' + dir,
+ name: dir
+ }));
+ });
+ }
+ this.$dirTree.prepend($template.octemplate({
dir: '',
name: '/'
}));
--
GitLab
From ba9849a1aa158f1d5ab371db88d76e492bf476ec Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 May 2013 08:42:15 +0200
Subject: [PATCH 219/304] Dialogs: Fix method names.
---
core/js/oc-dialogs.js | 117 +++++++++++++++++++-----------------------
1 file changed, 52 insertions(+), 65 deletions(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 074d3656f9..674df05635 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -58,45 +58,6 @@ var OCdialogs = {
confirm:function(text, title, callback, modal) {
this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
},
- _getFilePickerTemplate: function() {
- var defer = $.Deferred();
- if(!this.$filePickerTemplate) {
- var self = this;
- $.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
- self.$filePickerTemplate = $(tmpl);
- self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
- defer.resolve(self.$filePickerTemplate);
- })
- .fail(function() {
- defer.reject();
- });
- } else {
- defer.resolve(this.$filePickerTemplate);
- }
- return defer.promise();
- },
- _getMessageTemplate: function() {
- var defer = $.Deferred();
- if(!this.$messageTemplate) {
- var self = this;
- $.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
- self.$messageTemplate = $(tmpl);
- defer.resolve(self.$messageTemplate);
- })
- .fail(function() {
- defer.reject();
- });
- } else {
- defer.resolve(this.$messageTemplate);
- }
- return defer.promise();
- },
- _getFileList: function(dir, mimeType) {
- return $.getJSON(
- OC.filePath('files', 'ajax', 'rawlist.php'),
- {dir: dir, mimetype: mimeType}
- );
- },
/**
* show a file picker to pick a file from
* @param title dialog title
@@ -128,11 +89,11 @@ var OCdialogs = {
self.$filePicker.ready(function() {
self.$filelist = self.$filePicker.find('.filelist');
self.$dirTree = self.$filePicker.find('.dirtree');
- self.$dirTree.on('click', 'span:not(:last-child)', self, self.handleTreeListSelect);
+ self.$dirTree.on('click', 'span:not(:last-child)', self, self._handleTreeListSelect);
self.$filelist.on('click', 'li', function(event) {
- self.handlePickerClick(event, $(this));
+ self._handlePickerClick(event, $(this));
});
- self.fillFilePicker('');
+ self._fillFilePicker('');
}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
// build buttons
@@ -219,7 +180,7 @@ var OCdialogs = {
text: t('core', 'Cancel'),
click: function() { $(dialog_id).dialog('close'); }
};
- functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
+ functionToCall = function() { OCdialogs._promptOkHandler(callback, dialog_id); };
break;
default:
functionToCall = function() {
@@ -246,7 +207,46 @@ var OCdialogs = {
alert(t('core', 'Error loading file picker template'));
});
},
- determineValue: function(element) {
+ _getFilePickerTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$filePickerTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
+ self.$filePickerTemplate = $(tmpl);
+ self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
+ defer.resolve(self.$filePickerTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$filePickerTemplate);
+ }
+ return defer.promise();
+ },
+ _getMessageTemplate: function() {
+ var defer = $.Deferred();
+ if(!this.$messageTemplate) {
+ var self = this;
+ $.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+ self.$messageTemplate = $(tmpl);
+ defer.resolve(self.$messageTemplate);
+ })
+ .fail(function() {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$messageTemplate);
+ }
+ return defer.promise();
+ },
+ _getFileList: function(dir, mimeType) {
+ return $.getJSON(
+ OC.filePath('files', 'ajax', 'rawlist.php'),
+ {dir: dir, mimetype: mimeType}
+ );
+ },
+ _determineValue: function(element) {
if ( $(element).attr('type') === 'checkbox' ) {
return element.checked;
} else {
@@ -254,27 +254,14 @@ var OCdialogs = {
}
},
- prompt_ok_handler: function(callback, dialog_id) {
+ _promptOkHandler: function(callback, dialog_id) {
$(dialog_id).dialog('close');
if (callback !== undefined) { callback($(dialog_id + ' input#oc-dialog-prompt-input').val()) };
},
-
- form_ok_handler: function(callback, dialog_id) {
- if (callback !== undefined) {
- var valuelist = [];
- $(dialog_id + ' input, ' + dialog_id + ' select').each(function(index, element) {
- valuelist[index] = { name: $(element).attr('name'), value: OCdialogs.determineValue(element) };
- });
- $(dialog_id).dialog('close');
- callback(valuelist);
- } else {
- $(dialog_id).dialog('close');
- }
- },
/**
* fills the filepicker with files
*/
- fillFilePicker:function(dir) {
+ _fillFilePicker:function(dir) {
var dirs = [];
var others = [];
var self = this;
@@ -289,7 +276,7 @@ var OCdialogs = {
}
});
- self.fillSlug();
+ self._fillSlug();
var sorted = dirs.concat(others);
$.each(sorted, function(idx, entry) {
@@ -309,7 +296,7 @@ var OCdialogs = {
/**
* fills the tree list with directories
*/
- fillSlug: function() {
+ _fillSlug: function() {
this.$dirTree.empty();
var self = this
var path = this.$filePicker.data('path');
@@ -335,15 +322,15 @@ var OCdialogs = {
/**
* handle selection made in the tree list
*/
- handleTreeListSelect:function(event) {
+ _handleTreeListSelect:function(event) {
var self = event.data;
var dir = $(event.target).data('dir');
- self.fillFilePicker(dir);
+ self._fillFilePicker(dir);
},
/**
* handle clicks made in the filepicker
*/
- handlePickerClick:function(event, $element) {
+ _handlePickerClick:function(event, $element) {
if ($element.data('type') === 'file') {
if (this.$filePicker.data('multiselect') !== true || !event.ctrlKey) {
this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected');
@@ -351,7 +338,7 @@ var OCdialogs = {
$element.toggleClass('filepicker_element_selected');
return;
} else if ( $element.data('type') === 'dir' ) {
- this.fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
+ this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
}
}
};
--
GitLab
From ca6a77d39b738aeead0bbbfdfdf2a06382431f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 11:15:36 +0200
Subject: [PATCH 220/304] upgrade from old encryption to the new one needs to
generate share keys too
---
apps/files_encryption/hooks/hooks.php | 5 +++--
apps/files_encryption/lib/crypt.php | 32 +++++++++++++++++++++------
apps/files_encryption/lib/util.php | 15 ++++++++-----
3 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 0af0845d7c..a91bd9183f 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -97,9 +97,10 @@ class Hooks {
);
}
-
+
+ // DISABLED JUST FOR TESTING PURPOSE, ACTIVATE AGAIN!
// Register successful migration in DB
- $util->setMigrationStatus( 1 );
+ //$util->setMigrationStatus( 1 );
}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 5267ba81f5..74f8a1ffa3 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -479,15 +479,33 @@ class Crypt {
* keys: data, key
* @note this method is a wrapper for combining other crypt class methods
*/
- public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
-
+ public static function keyEncryptKeyfile( $plainContent, $publicKey, $path ) {
+
+ $user = \OCP\User::getUser();
+ $view = new \OC_FilesystemView('/');
+ $util = new Util($view, $user);
+
// Encrypt plain data, generate keyfile & encrypted file
$cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
// Encrypt keyfile
- $cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
-
- return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // if file exists try to get sharing users
+ if($view->file_exists($path)) {
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $path, $user );
+ } else {
+ $uniqueUserIds[] = $user;
+ }
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );
+
+ return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
}
@@ -725,11 +743,11 @@ class Crypt {
}
- public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
+ public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase, $path ) {
$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
- $recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
+ $recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey, $path );
return $recrypted;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index fab807b014..5a6583465e 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -714,16 +714,19 @@ class Util {
// Fetch data from file
$legacyData = $this->view->file_get_contents( $legacyFile['path'] );
-
+
// Recrypt data, generate catfile
- $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase );
+ $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'] );
- $relPath = $legacyFile['path'];
- $rawPath = $this->userId . '/files/' . $plainFile['path'];
+ $rawPath = $legacyFile['path'];
+ $relPath = $this->stripUserFilesPath($rawPath);
// Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['key'] );
-
+ Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
+
+ // Save sharekeys to user folders
+ Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
+
// Overwrite the existing file with the encrypted one
$this->view->file_put_contents( $rawPath, $recrypted['data'] );
--
GitLab
From 800c39fef1d7375314ebc1e4723896b27f946bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 17 May 2013 12:47:32 +0200
Subject: [PATCH 221/304] cleanup after people who don't test in ie
---
core/js/config.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/js/config.php b/core/js/config.php
index 48bea6ae54..53a8fb9638 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,8 @@ $array = array(
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
"oc_webroot" => "\"".OC::$WEBROOT."\"",
"oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
- "oc_current_user" => "document.head.getAttribute('data-user')",
- "oc_requesttoken" => "document.head.getAttribute('data-requesttoken')",
+ "oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
+ "oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
"dayNames" => json_encode(
array(
@@ -62,4 +62,4 @@ $array = array(
// Echo it
foreach ($array as $setting => $value) {
echo("var ". $setting ."=".$value.";\n");
-}
\ No newline at end of file
+}
--
GitLab
From bf04a21973b2ca88ea35cca3261a0f415cc36559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 13:16:52 +0200
Subject: [PATCH 222/304] set migration status after successful upgrade
---
apps/files_encryption/hooks/hooks.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index a91bd9183f..76a19ff968 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -98,9 +98,8 @@ class Hooks {
}
- // DISABLED JUST FOR TESTING PURPOSE, ACTIVATE AGAIN!
// Register successful migration in DB
- //$util->setMigrationStatus( 1 );
+ $util->setMigrationStatus( 1 );
}
--
GitLab
From 93771f735b2347eb851941a414220af7b6ccd066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 14:13:05 +0200
Subject: [PATCH 223/304] gremove unused code
---
apps/files_encryption/lib/crypt.php | 68 ++--------------
apps/files_encryption/lib/util.php | 113 ++++++++++++++------------
apps/files_encryption/tests/crypt.php | 41 ----------
3 files changed, 68 insertions(+), 154 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 74f8a1ffa3..708d1719d7 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -472,61 +472,7 @@ class Crypt {
return $result;
}
-
- /**
- * @brief Encrypts content symmetrically and generates keyfile asymmetrically
- * @returns array containing catfile and new keyfile.
- * keys: data, key
- * @note this method is a wrapper for combining other crypt class methods
- */
- public static function keyEncryptKeyfile( $plainContent, $publicKey, $path ) {
-
- $user = \OCP\User::getUser();
- $view = new \OC_FilesystemView('/');
- $util = new Util($view, $user);
-
- // Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
-
- // Encrypt keyfile
-
- $sharingEnabled = \OCP\Share::isEnabled();
-
- // if file exists try to get sharing users
- if($view->file_exists($path)) {
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $path, $user );
- } else {
- $uniqueUserIds[] = $user;
- }
-
- // Fetch public keys for all users who will share the file
- $publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
-
- // Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );
-
- return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
-
- }
-
- /**
- * @brief Takes catfile, keyfile, and private key, and
- * performs decryption
- * @returns decrypted content
- * @note this method is a wrapper for combining other crypt class methods
- */
- public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
-
- // Decrypt the keyfile with the user's private key
- $decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
- // Decrypt the catfile symmetrically using the decrypted keyfile
- $decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
-
- return $decryptedData;
-
- }
-
/**
* @brief Symmetrically encrypt a file by combining encrypted component data blocks
*/
@@ -743,13 +689,17 @@ class Crypt {
}
- public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase, $path ) {
+ public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
-
- $recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey, $path );
-
- return $recrypted;
+
+ // Encrypt plain data, generate keyfile & encrypted file
+ $cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );
+
+ // Encrypt plain keyfile to multiple sharefiles
+ $multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );
+
+ return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b312b502c1..a2dee1ca71 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -656,103 +656,108 @@ class Util {
* @param string $dirPath the directory whose files will be encrypted
* @note Encryption is recursive
*/
- public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
-
- if ( $found = $this->findEncFiles( $dirPath ) ) {
-
+ public function encryptAll($publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null) {
+
+ if ($found = $this->findEncFiles($dirPath)) {
+
// Disable proxy to prevent file being encrypted twice
\OC_FileProxy::$enabled = false;
-
+
// Encrypt unencrypted files
- foreach ( $found['plain'] as $plainFile ) {
-
+ foreach ($found['plain'] as $plainFile) {
+
//relative to data/<user>/file
$relPath = $plainFile['path'];
-
+
//relative to /data
- $rawPath = $this->userId . '/files/' . $plainFile['path'];
-
+ $rawPath = $this->userId . '/files/' . $plainFile['path'];
+
// Open plain file handle for binary reading
- $plainHandle1 = $this->view->fopen( $rawPath, 'rb' );
-
+ $plainHandle1 = $this->view->fopen($rawPath, 'rb');
+
// 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
- $plainHandle2 = $this->view->fopen( $rawPath . '.plaintmp', 'wb' );
-
+ $plainHandle2 = $this->view->fopen($rawPath . '.plaintmp', 'wb');
+
// Move plain file to a temporary location
- stream_copy_to_stream( $plainHandle1, $plainHandle2 );
-
+ stream_copy_to_stream($plainHandle1, $plainHandle2);
+
// Close access to original file
// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
-
// Delete original plain file so we can rename enc file later
- $this->view->unlink( $rawPath );
-
+ $this->view->unlink($rawPath);
+
// Open enc file handle for binary writing, with same filename as original plain file
- $encHandle = fopen( 'crypt://' . $relPath, 'wb' );
-
+ $encHandle = fopen('crypt://' . $relPath, 'wb');
+
// Save data from plain stream to new encrypted file via enc stream
// NOTE: Stream{} will be invoked for handling
// the encryption, and should handle all keys
// and their generation etc. automatically
- $size = stream_copy_to_stream( $plainHandle2, $encHandle );
-
+ $size = stream_copy_to_stream($plainHandle2, $encHandle);
+
// Delete temporary plain copy of file
- $this->view->unlink( $rawPath . '.plaintmp' );
-
+ $this->view->unlink($rawPath . '.plaintmp');
+
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-
+ \OC\Files\Filesystem::putFileInfo($plainFile['path'], array('encrypted' => true, 'size' => $size), '');
}
-
+
// Encrypt legacy encrypted files
- if (
- ! empty( $legacyPassphrase )
- && ! empty( $newPassphrase )
+ if (
+ !empty($legacyPassphrase)
+ && !empty($newPassphrase)
) {
-
- foreach ( $found['legacy'] as $legacyFile ) {
-
+
+ foreach ($found['legacy'] as $legacyFile) {
+
// Fetch data from file
- $legacyData = $this->view->file_get_contents( $legacyFile['path'] );
+ $legacyData = $this->view->file_get_contents($legacyFile['path']);
+
+ $sharingEnabled = \OCP\Share::isEnabled();
+
+ // if file exists try to get sharing users
+ if ($view->file_exists($legacyFile['path'])) {
+ $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
+ } else {
+ $uniqueUserIds[] = $this->userId;
+ }
+
+ // Fetch public keys for all users who will share the file
+ $publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
// Recrypt data, generate catfile
- $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'] );
-
+ $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'], $publicKeys);
+
$rawPath = $legacyFile['path'];
$relPath = $this->stripUserFilesPath($rawPath);
-
+
// Save keyfile
- Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
+ Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
// Save sharekeys to user folders
- Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
+ Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
// Overwrite the existing file with the encrypted one
- $this->view->file_put_contents( $rawPath, $recrypted['data'] );
-
- $size = strlen( $recrypted['data'] );
-
+ $this->view->file_put_contents($rawPath, $recrypted['data']);
+
+ $size = strlen($recrypted['data']);
+
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted'=>true, 'size' => $size ), '' );
-
+ \OC\Files\Filesystem::putFileInfo($rawPath, array('encrypted' => true, 'size' => $size), '');
}
-
}
-
+
\OC_FileProxy::$enabled = true;
-
+
// If files were found, return true
return true;
-
} else {
-
+
// If no files were found, return false
return false;
-
}
-
}
-
+
/**
* @brief Return important encryption related paths
* @param string $pathName Name of the directory to return the path of
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index bfb5ca0ec8..69fd99d9a8 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -513,48 +513,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataUrl, $decrypt );
}
-
- // What is the point of this test? It doesn't use keyEncryptKeyfile()
- function testKeyEncryptKeyfile() {
-
- # TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
-
- // Generate keypair
- $pair1 = Encryption\Crypt::createKeypair();
-
- // Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-
- // Encrypt keyfile
- $cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
-
- // Decrypt keyfile
- $decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
-
- // Decrypt encrypted file
- $decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
-
- $this->assertEquals( $this->dataUrl, $decryptData );
-
- }
-
- /**
- * @brief test functionality of keyEncryptKeyfile() and
- * keyDecryptKeyfile()
- */
- function testKeyDecryptKeyfile() {
-
- $encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
-
- $this->assertNotEquals( $encrypted['data'], $this->dataShort );
- $decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
-
- $this->assertEquals( $decrypted, $this->dataShort );
-
- }
-
-
/**
* @brief test encryption using legacy blowfish method
*/
--
GitLab
From 002445e23d8dcefe2545f22e6914d7cfa7ebbbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 14:49:54 +0200
Subject: [PATCH 224/304] some typo fixed
---
3rdparty | 1 -
apps/files_encryption/lib/util.php | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
delete mode 160000 3rdparty
diff --git a/3rdparty b/3rdparty
deleted file mode 160000
index 2d59ac4f7b..0000000000
--- a/3rdparty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a2dee1ca71..f1042ed759 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -716,8 +716,8 @@ class Util {
$sharingEnabled = \OCP\Share::isEnabled();
// if file exists try to get sharing users
- if ($view->file_exists($legacyFile['path'])) {
- $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
+ if ($this->view->file_exists($legacyFile['path'])) {
+ $uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
} else {
$uniqueUserIds[] = $this->userId;
}
@@ -726,7 +726,7 @@ class Util {
$publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
// Recrypt data, generate catfile
- $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'], $publicKeys);
+ $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path']);
$rawPath = $legacyFile['path'];
$relPath = $this->stripUserFilesPath($rawPath);
--
GitLab
From bdf74090fc073a9968a14ff53e7d70954f5920e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 14:56:37 +0200
Subject: [PATCH 225/304] re-add 3rdparty submodule
---
.gitmodules | 2 +-
3rdparty | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 160000 3rdparty
diff --git a/.gitmodules b/.gitmodules
index b9c1a3702c..6e5521b6f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "3rdparty"]
path = 3rdparty
- url = git://github.com/owncloud/3rdparty.git
+ url = git@github.com:owncloud/3rdparty.git
diff --git a/3rdparty b/3rdparty
new file mode 160000
index 0000000000..2d59ac4f7b
--- /dev/null
+++ b/3rdparty
@@ -0,0 +1 @@
+Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee
--
GitLab
From c3779555aa38940cb16790407c71bc852b9bd742 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 17 May 2013 16:18:40 +0200
Subject: [PATCH 226/304] Dialogs: Home folder icon instead of '/'.
---
core/css/styles.css | 5 +++++
core/js/oc-dialogs.js | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 71b1c1fab8..70a840d689 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -383,6 +383,11 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
/* ---- DIALOGS ---- */
#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
+#oc-dialog-filepicker-content .dirtree .home {
+ background-image:url('../img/places/home.svg');
+ background-repeat:no-repeat;
+ background-position: left center;
+}
#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 674df05635..e05b3b0207 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -314,10 +314,10 @@ var OCdialogs = {
}));
});
}
- this.$dirTree.prepend($template.octemplate({
+ $template.octemplate({
dir: '',
- name: '/'
- }));
+ name: ' ' // Ugly but works ;)
+ }, {escapeFunction: null}).addClass('home svg').prependTo(this.$dirTree);
},
/**
* handle selection made in the tree list
--
GitLab
From eaa61b8539bcd1f428d8fad1d67894e8cb4f271a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 17:29:32 +0200
Subject: [PATCH 227/304] fix migration to new encryption
---
apps/files_encryption/ajax/encryptall.php | 40 -----------------------
apps/files_encryption/hooks/hooks.php | 2 +-
apps/files_encryption/lib/crypt.php | 21 +++++++++---
apps/files_encryption/lib/util.php | 3 +-
4 files changed, 18 insertions(+), 48 deletions(-)
delete mode 100644 apps/files_encryption/ajax/encryptall.php
diff --git a/apps/files_encryption/ajax/encryptall.php b/apps/files_encryption/ajax/encryptall.php
deleted file mode 100644
index ce613ca443..0000000000
--- a/apps/files_encryption/ajax/encryptall.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- *
- * @brief Script to handle manual trigger of \OCA\Encryption\Util{}->encryptAll()
- */
-
-use OCA\Encryption;
-
-\OCP\JSON::checkAppEnabled( 'files_encryption' );
-\OCP\JSON::callCheck();
-
-$return = false;
-
-if (
- isset( $_POST['encryptAll'] )
- && ! empty( $_POST['userPassword'] )
-) {
-
- $view = new \OC_FilesystemView( '' );
- $userId = \OCP\User::getUser();
- $util = new \OCA\Encryption\Util( $view, $userId );
- $session = new \OCA\Encryption\Session( $view );
- $publicKey = \OCA\Encryption\Keymanager::getPublicKey( $view, $userId );
- $path = '/' . $userId . '/' . 'files';
-
- $util->encryptAll( $publicKey, $path, $session->getLegacyKey(), $_POST['userPassword'] );
-
- $return = true;
-
-} else {
-
- $return = false;
-
-}
-
-// Return success or failure
-( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 76a19ff968..72334559b8 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -88,7 +88,7 @@ class Hooks {
// This serves to upgrade old versions of the encryption
// app (see appinfo/spec.txt)
if (
- $util->encryptAll( $publicKey, '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
+ $util->encryptAll( '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
) {
\OC_Log::write(
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 708d1719d7..56dacc94b0 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -169,7 +169,7 @@ class Crypt {
* @return true / false
*/
public static function isLegacyEncryptedContent( $data, $relPath ) {
-
+
// Fetch all file metadata from DB
$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
@@ -683,15 +683,26 @@ class Crypt {
$decrypted = $bf->decrypt( $content );
- $trimmed = rtrim( $decrypted, "\0" );
-
- return $trimmed;
+ return $decrypted;
}
+
+ private static function legacyBlockDecrypt($data, $key='',$maxLength=0) {
+ $result = '';
+ while (strlen($data)) {
+ $result.=self::legacyDecrypt(substr($data, 0, 8192), $key);
+ $data = substr($data, 8192);
+ }
+ if ($maxLength > 0) {
+ return substr($result, 0, $maxLength);
+ } else {
+ return rtrim($result, "\0");
+ }
+ }
public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
- $decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
+ $decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );
// Encrypt plain data, generate keyfile & encrypted file
$cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f1042ed759..9588db8d64 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -652,11 +652,10 @@ class Util {
/**
* @brief Encrypt all files in a directory
- * @param string $publicKey the public key to encrypt files with
* @param string $dirPath the directory whose files will be encrypted
* @note Encryption is recursive
*/
- public function encryptAll($publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null) {
+ public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
if ($found = $this->findEncFiles($dirPath)) {
--
GitLab
From e7d1fe82aa21a1add52794f26260d8952a276773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 17 May 2013 18:01:32 +0200
Subject: [PATCH 228/304] fix path to class
---
apps/files_encryption/ajax/adminrecovery.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index dc13bc57c1..a32225d036 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -21,14 +21,14 @@ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
- $return = \Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
+ $return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
// Disable recoveryAdmin
} elseif (
isset($_POST['adminEnableRecovery'])
&& 0 == $_POST['adminEnableRecovery']
) {
- $return = \Helper::adminDisableRecovery($_POST['recoveryPassword']);
+ $return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
}
// Return success or failure
--
GitLab
From cea9208ceccda86a33ec294926d39adecb962ed2 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 21:59:53 +0200
Subject: [PATCH 229/304] fix broken legacy tests
---
apps/files_encryption/lib/crypt.php | 4 ++--
apps/files_encryption/tests/crypt.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 56dacc94b0..046b4601b0 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -652,7 +652,7 @@ class Crypt {
return $legacyEncKey;
}
-
+
/**
* @brief encrypts content using legacy blowfish system
* @param $content the cleartext message you want to encrypt
@@ -683,7 +683,7 @@ class Crypt {
$decrypted = $bf->decrypt( $content );
- return $decrypted;
+ return rtrim($decrypted, "\0");;
}
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 69fd99d9a8..9737eefb96 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -595,7 +595,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
*/
function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
- $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
+ $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
$this->assertNotEquals( $this->dataLong, $recrypted['data'] );
--
GitLab
From b6572cedac8aa26d75ae09062b9e5500b00e845a Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 22:16:56 +0200
Subject: [PATCH 230/304] added folder move test
---
apps/files_encryption/tests/crypt.php | 35 ++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 9737eefb96..16cdc88f1c 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -649,7 +649,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $decrypt );
- $newFolder = '/newfolder1';
+ $newFolder = '/newfolder'.time();
$newFilename = 'tmp-new-'.time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
$view->mkdir($newFolder);
@@ -664,6 +664,39 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
$view->unlink( $newFolder );
}
+ function testMoveFolder() {
+
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ $filename = '/tmp-'.time();
+ $folder = '/folder'.time();
+
+ $view->mkdir($folder);
+
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents( 'crypt://' . $folder . $filename, $this->dataLong );
+
+ // Test that data was successfully written
+ $this->assertTrue( is_int( $cryptedFile ) );
+
+ // Get file decrypted contents
+ $decrypt = file_get_contents( 'crypt://' . $folder . $filename );
+
+ $this->assertEquals( $this->dataLong, $decrypt );
+
+ $newFolder = '/newfolder'.time();
+
+ $view->rename( $folder, $newFolder );
+
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents( 'crypt://' . $newFolder . $filename );
+
+ $this->assertEquals( $this->dataLong, $newDecrypt );
+
+ // tear down
+ $view->unlink( $newFolder );
+ }
+
function testRenameFolder() {
$filename = '/tmp-'.time();
--
GitLab
From 3aa48616a6cc960896d8a17e7854a71ee6f308a7 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 22:44:45 +0200
Subject: [PATCH 231/304] remove unused code
---
apps/files_encryption/lib/crypt.php | 123 ++--------------------------
1 file changed, 9 insertions(+), 114 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 046b4601b0..ba588819d0 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -155,7 +155,7 @@ class Crypt {
// TODO: Use DI to get \OC\Files\Filesystem out of here
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );
+ $metadata = \OC\Files\Filesystem::getFileInfo( $path);
// Return encryption status
return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
@@ -474,78 +474,9 @@ class Crypt {
}
/**
- * @brief Symmetrically encrypt a file by combining encrypted component data blocks
- */
- public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
-
- $crypted = '';
-
- $remaining = $plainContent;
-
- $testarray = array();
-
- while( strlen( $remaining ) ) {
-
- //echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
-
- // Encrypt a chunk of unencrypted data and add it to the rest
- $block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
-
- $padded = self::addPadding( $block );
-
- $crypted .= $block;
-
- $testarray[] = $block;
-
- // Remove the data already encrypted from remaining unencrypted data
- $remaining = substr( $remaining, 6126 );
-
- }
-
- //echo "hags ";
-
- //echo "\n\n\n\$crypted = $crypted\n\n\n";
-
- //print_r($testarray);
-
- return $crypted;
-
- }
-
-
- /**
- * @brief Symmetrically decrypt a file by combining encrypted component data blocks
- */
- public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
-
- $decrypted = '';
-
- $remaining = $crypted;
-
- $testarray = array();
-
- while( strlen( $remaining ) ) {
-
- $testarray[] = substr( $remaining, 0, 8192 );
-
- // Decrypt a chunk of unencrypted data and add it to the rest
- $decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
-
- // Remove the data already encrypted from remaining unencrypted data
- $remaining = substr( $remaining, 8192 );
-
- }
-
- //echo "\n\n\$testarray = "; print_r($testarray);
-
- return $decrypted;
-
- }
-
- /**
- * @brief Generates a pseudo random initialisation vector
- * @return String $iv generated IV
- */
+ * @brief Generates a pseudo random initialisation vector
+ * @return String $iv generated IV
+ */
public static function generateIv() {
if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
@@ -571,10 +502,10 @@ class Crypt {
}
- /**
- * @brief Generate a pseudo random 1024kb ASCII key
- * @returns $key Generated key
- */
+ /**
+ * @brief Generate a pseudo random 1024kb ASCII key
+ * @returns $key Generated key
+ */
public static function generateKey() {
// Generate key
@@ -597,29 +528,6 @@ class Crypt {
}
- public static function changekeypasscode( $oldPassword, $newPassword ) {
-
- if ( \OCP\User::isLoggedIn() ) {
-
- $key = Keymanager::getPrivateKey( $user, $view );
-
- if ( ( $key = Crypt::symmetricDecryptFileContent($key,$oldpasswd) ) ) {
-
- if ( ( $key = Crypt::symmetricEncryptFileContent( $key, $newpasswd ) ) ) {
-
- Keymanager::setPrivateKey( $key );
-
- return true;
- }
-
- }
-
- }
-
- return false;
-
- }
-
/**
* @brief Get the blowfish encryption handeler for a key
* @param $key string (optional)
@@ -713,18 +621,5 @@ class Crypt {
return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
}
-
- /**
- * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
- * @param $legacyContent the legacy encrypted content to re-encrypt
- * @returns cleartext content
- *
- * This function decrypts an content
- */
- public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
-
- // TODO: write me
-
- }
-
+
}
\ No newline at end of file
--
GitLab
From 41165afa598e828f86c07440350a5b2453dd5ddc Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 17 May 2013 22:45:09 +0200
Subject: [PATCH 232/304] improved tests
---
apps/files_encryption/tests/crypt.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 16cdc88f1c..2dd644e07b 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -340,7 +340,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
//print_r($r);
// Join IVs and their respective data chunks
- $e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
+ $e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11]);//.$r[11], $r[12].$r[13], $r[14] );
//print_r($e);
@@ -395,6 +395,14 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->assertTrue(Encryption\Crypt::isEncryptedMeta($filename));
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
// Get file decrypted contents
$decrypt = file_get_contents( 'crypt://' . $filename );
@@ -616,7 +624,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
// Test that data was successfully written
$this->assertTrue( is_int( $cryptedFile ) );
- // Get file decrypted contents
+ // Get file decrypted contents
$decrypt = file_get_contents( 'crypt://' . $filename );
$this->assertEquals( $this->dataLong, $decrypt );
--
GitLab
From 9428d813bacf58bc76e54dea1b4fed3dfc8b824b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 18 May 2013 02:03:28 +0200
Subject: [PATCH 233/304] [tx-robot] updated from transifex
---
apps/files/l10n/ca.php | 1 +
apps/files/l10n/ja_JP.php | 1 +
apps/files/l10n/ru_RU.php | 70 +-----
apps/files_trashbin/l10n/ru_RU.php | 17 +-
apps/user_ldap/l10n/ar.php | 1 +
apps/user_ldap/l10n/bg_BG.php | 1 +
apps/user_ldap/l10n/bn_BD.php | 1 +
apps/user_ldap/l10n/ca.php | 14 ++
apps/user_ldap/l10n/cs_CZ.php | 2 +
apps/user_ldap/l10n/cy_GB.php | 1 +
apps/user_ldap/l10n/da.php | 2 +
apps/user_ldap/l10n/de.php | 2 +
apps/user_ldap/l10n/de_DE.php | 2 +
apps/user_ldap/l10n/el.php | 2 +
apps/user_ldap/l10n/eo.php | 2 +
apps/user_ldap/l10n/es.php | 3 +
apps/user_ldap/l10n/es_AR.php | 2 +
apps/user_ldap/l10n/et_EE.php | 2 +
apps/user_ldap/l10n/eu.php | 2 +
apps/user_ldap/l10n/fa.php | 1 +
apps/user_ldap/l10n/fi_FI.php | 2 +
apps/user_ldap/l10n/fr.php | 14 +-
apps/user_ldap/l10n/gl.php | 14 ++
apps/user_ldap/l10n/he.php | 1 +
apps/user_ldap/l10n/hr.php | 1 +
apps/user_ldap/l10n/hu_HU.php | 1 +
apps/user_ldap/l10n/ia.php | 1 +
apps/user_ldap/l10n/id.php | 2 +
apps/user_ldap/l10n/is.php | 1 +
apps/user_ldap/l10n/it.php | 11 +
apps/user_ldap/l10n/ja_JP.php | 13 ++
apps/user_ldap/l10n/ka_GE.php | 2 +
apps/user_ldap/l10n/ko.php | 1 +
apps/user_ldap/l10n/ku_IQ.php | 2 +
apps/user_ldap/l10n/lb.php | 1 +
apps/user_ldap/l10n/lt_LT.php | 1 +
apps/user_ldap/l10n/lv.php | 1 +
apps/user_ldap/l10n/mk.php | 1 +
apps/user_ldap/l10n/ms_MY.php | 1 +
apps/user_ldap/l10n/nb_NO.php | 2 +
apps/user_ldap/l10n/nl.php | 11 +
apps/user_ldap/l10n/nn_NO.php | 1 +
apps/user_ldap/l10n/oc.php | 1 +
apps/user_ldap/l10n/pl.php | 2 +
apps/user_ldap/l10n/pt_BR.php | 14 ++
apps/user_ldap/l10n/pt_PT.php | 2 +
apps/user_ldap/l10n/ro.php | 2 +
apps/user_ldap/l10n/ru.php | 2 +
apps/user_ldap/l10n/ru_RU.php | 42 +---
apps/user_ldap/l10n/si_LK.php | 2 +
apps/user_ldap/l10n/sk_SK.php | 2 +
apps/user_ldap/l10n/sl.php | 2 +
apps/user_ldap/l10n/sq.php | 1 +
apps/user_ldap/l10n/sr.php | 1 +
apps/user_ldap/l10n/sv.php | 2 +
apps/user_ldap/l10n/ta_LK.php | 1 +
apps/user_ldap/l10n/te.php | 1 +
apps/user_ldap/l10n/th_TH.php | 2 +
apps/user_ldap/l10n/tr.php | 1 +
apps/user_ldap/l10n/ug.php | 1 +
apps/user_ldap/l10n/uk.php | 2 +
apps/user_ldap/l10n/ur_PK.php | 1 +
apps/user_ldap/l10n/vi.php | 2 +
apps/user_ldap/l10n/zh_CN.GB2312.php | 2 +
apps/user_ldap/l10n/zh_CN.php | 2 +
apps/user_ldap/l10n/zh_HK.php | 2 +
apps/user_ldap/l10n/zh_TW.php | 2 +
core/l10n/ru_RU.php | 3 +-
l10n/ar/core.po | 4 +-
l10n/ar/files.po | 4 +-
l10n/ar/files_trashbin.po | 4 +-
l10n/ar/settings.po | 26 +--
l10n/ar/user_ldap.po | 6 +-
l10n/bg_BG/core.po | 4 +-
l10n/bg_BG/files.po | 4 +-
l10n/bg_BG/files_trashbin.po | 4 +-
l10n/bg_BG/settings.po | 26 +--
l10n/bg_BG/user_ldap.po | 6 +-
l10n/bn_BD/core.po | 4 +-
l10n/bn_BD/files.po | 4 +-
l10n/bn_BD/files_trashbin.po | 4 +-
l10n/bn_BD/settings.po | 26 +--
l10n/bn_BD/user_ldap.po | 6 +-
l10n/ca/core.po | 8 +-
l10n/ca/files.po | 9 +-
l10n/ca/files_trashbin.po | 4 +-
l10n/ca/settings.po | 28 +--
l10n/ca/user_ldap.po | 35 +--
l10n/cs_CZ/core.po | 4 +-
l10n/cs_CZ/files.po | 4 +-
l10n/cs_CZ/files_trashbin.po | 4 +-
l10n/cs_CZ/settings.po | 26 +--
l10n/cs_CZ/user_ldap.po | 8 +-
l10n/cy_GB/core.po | 4 +-
l10n/cy_GB/files.po | 4 +-
l10n/cy_GB/files_trashbin.po | 4 +-
l10n/cy_GB/settings.po | 24 +--
l10n/cy_GB/user_ldap.po | 6 +-
l10n/da/core.po | 4 +-
l10n/da/files.po | 4 +-
l10n/da/files_trashbin.po | 4 +-
l10n/da/settings.po | 24 +--
l10n/da/user_ldap.po | 8 +-
l10n/de/core.po | 4 +-
l10n/de/files.po | 4 +-
l10n/de/files_trashbin.po | 4 +-
l10n/de/settings.po | 4 +-
l10n/de/user_ldap.po | 8 +-
l10n/de_DE/core.po | 4 +-
l10n/de_DE/files.po | 4 +-
l10n/de_DE/files_trashbin.po | 4 +-
l10n/de_DE/settings.po | 4 +-
l10n/de_DE/user_ldap.po | 8 +-
l10n/el/core.po | 4 +-
l10n/el/files.po | 4 +-
l10n/el/files_trashbin.po | 4 +-
l10n/el/settings.po | 26 +--
l10n/el/user_ldap.po | 8 +-
l10n/eo/core.po | 4 +-
l10n/eo/files.po | 4 +-
l10n/eo/files_trashbin.po | 4 +-
l10n/eo/settings.po | 26 +--
l10n/eo/user_ldap.po | 8 +-
l10n/es/core.po | 4 +-
l10n/es/files.po | 4 +-
l10n/es/files_trashbin.po | 4 +-
l10n/es/settings.po | 24 +--
l10n/es/user_ldap.po | 13 +-
l10n/es_AR/core.po | 4 +-
l10n/es_AR/files.po | 4 +-
l10n/es_AR/files_trashbin.po | 4 +-
l10n/es_AR/settings.po | 26 +--
l10n/es_AR/user_ldap.po | 8 +-
l10n/et_EE/core.po | 4 +-
l10n/et_EE/files.po | 4 +-
l10n/et_EE/files_trashbin.po | 4 +-
l10n/et_EE/settings.po | 4 +-
l10n/et_EE/user_ldap.po | 8 +-
l10n/eu/core.po | 4 +-
l10n/eu/files.po | 4 +-
l10n/eu/files_trashbin.po | 4 +-
l10n/eu/settings.po | 26 +--
l10n/eu/user_ldap.po | 8 +-
l10n/fa/core.po | 4 +-
l10n/fa/files.po | 4 +-
l10n/fa/files_trashbin.po | 4 +-
l10n/fa/settings.po | 26 +--
l10n/fa/user_ldap.po | 6 +-
l10n/fi_FI/core.po | 4 +-
l10n/fi_FI/files.po | 4 +-
l10n/fi_FI/files_trashbin.po | 4 +-
l10n/fi_FI/settings.po | 26 +--
l10n/fi_FI/user_ldap.po | 8 +-
l10n/fr/core.po | 4 +-
l10n/fr/files.po | 4 +-
l10n/fr/files_trashbin.po | 4 +-
l10n/fr/settings.po | 26 +--
l10n/fr/user_ldap.po | 24 +--
l10n/gl/core.po | 4 +-
l10n/gl/files.po | 4 +-
l10n/gl/files_trashbin.po | 4 +-
l10n/gl/settings.po | 4 +-
l10n/gl/user_ldap.po | 35 +--
l10n/he/core.po | 4 +-
l10n/he/files.po | 4 +-
l10n/he/files_trashbin.po | 4 +-
l10n/he/settings.po | 26 +--
l10n/he/user_ldap.po | 6 +-
l10n/hr/core.po | 4 +-
l10n/hr/files.po | 4 +-
l10n/hr/files_trashbin.po | 4 +-
l10n/hr/settings.po | 26 +--
l10n/hr/user_ldap.po | 6 +-
l10n/hu_HU/core.po | 4 +-
l10n/hu_HU/files.po | 4 +-
l10n/hu_HU/files_trashbin.po | 4 +-
l10n/hu_HU/settings.po | 24 +--
l10n/hu_HU/user_ldap.po | 6 +-
l10n/ia/core.po | 4 +-
l10n/ia/files.po | 4 +-
l10n/ia/files_trashbin.po | 4 +-
l10n/ia/settings.po | 6 +-
l10n/ia/user_ldap.po | 6 +-
l10n/id/core.po | 4 +-
l10n/id/files.po | 4 +-
l10n/id/files_trashbin.po | 4 +-
l10n/id/settings.po | 26 +--
l10n/id/user_ldap.po | 8 +-
l10n/is/core.po | 4 +-
l10n/is/files.po | 4 +-
l10n/is/files_trashbin.po | 4 +-
l10n/is/settings.po | 26 +--
l10n/is/user_ldap.po | 6 +-
l10n/it/core.po | 4 +-
l10n/it/files.po | 4 +-
l10n/it/files_trashbin.po | 4 +-
l10n/it/settings.po | 4 +-
l10n/it/user_ldap.po | 29 +--
l10n/ja_JP/core.po | 4 +-
l10n/ja_JP/files.po | 9 +-
l10n/ja_JP/files_trashbin.po | 4 +-
l10n/ja_JP/settings.po | 24 +--
l10n/ja_JP/user_ldap.po | 32 +--
l10n/ka_GE/core.po | 4 +-
l10n/ka_GE/files.po | 4 +-
l10n/ka_GE/files_trashbin.po | 4 +-
l10n/ka_GE/settings.po | 26 +--
l10n/ka_GE/user_ldap.po | 8 +-
l10n/ko/core.po | 4 +-
l10n/ko/files.po | 4 +-
l10n/ko/files_trashbin.po | 4 +-
l10n/ko/settings.po | 4 +-
l10n/ko/user_ldap.po | 6 +-
l10n/ku_IQ/core.po | 4 +-
l10n/ku_IQ/files.po | 4 +-
l10n/ku_IQ/files_trashbin.po | 4 +-
l10n/ku_IQ/settings.po | 26 +--
l10n/ku_IQ/user_ldap.po | 8 +-
l10n/lb/core.po | 4 +-
l10n/lb/files.po | 4 +-
l10n/lb/files_trashbin.po | 4 +-
l10n/lb/settings.po | 26 +--
l10n/lb/user_ldap.po | 6 +-
l10n/lt_LT/core.po | 4 +-
l10n/lt_LT/files.po | 4 +-
l10n/lt_LT/files_trashbin.po | 4 +-
l10n/lt_LT/settings.po | 26 +--
l10n/lt_LT/user_ldap.po | 6 +-
l10n/lv/core.po | 4 +-
l10n/lv/files.po | 4 +-
l10n/lv/files_trashbin.po | 4 +-
l10n/lv/settings.po | 26 +--
l10n/lv/user_ldap.po | 6 +-
l10n/mk/core.po | 4 +-
l10n/mk/files.po | 4 +-
l10n/mk/files_trashbin.po | 4 +-
l10n/mk/settings.po | 26 +--
l10n/mk/user_ldap.po | 6 +-
l10n/ms_MY/core.po | 4 +-
l10n/ms_MY/files.po | 4 +-
l10n/ms_MY/files_trashbin.po | 4 +-
l10n/ms_MY/settings.po | 26 +--
l10n/ms_MY/user_ldap.po | 6 +-
l10n/nb_NO/core.po | 4 +-
l10n/nb_NO/files.po | 4 +-
l10n/nb_NO/files_trashbin.po | 4 +-
l10n/nb_NO/settings.po | 26 +--
l10n/nb_NO/user_ldap.po | 8 +-
l10n/nl/core.po | 4 +-
l10n/nl/files.po | 4 +-
l10n/nl/files_trashbin.po | 4 +-
l10n/nl/settings.po | 24 +--
l10n/nl/user_ldap.po | 29 +--
l10n/nn_NO/core.po | 4 +-
l10n/nn_NO/files.po | 4 +-
l10n/nn_NO/files_trashbin.po | 4 +-
l10n/nn_NO/settings.po | 4 +-
l10n/nn_NO/user_ldap.po | 6 +-
l10n/oc/core.po | 4 +-
l10n/oc/files.po | 4 +-
l10n/oc/files_trashbin.po | 4 +-
l10n/oc/settings.po | 26 +--
l10n/oc/user_ldap.po | 6 +-
l10n/pl/core.po | 4 +-
l10n/pl/files.po | 4 +-
l10n/pl/files_trashbin.po | 4 +-
l10n/pl/settings.po | 4 +-
l10n/pl/user_ldap.po | 8 +-
l10n/pt_BR/core.po | 4 +-
l10n/pt_BR/files.po | 4 +-
l10n/pt_BR/files_trashbin.po | 4 +-
l10n/pt_BR/settings.po | 24 +--
l10n/pt_BR/user_ldap.po | 35 +--
l10n/pt_PT/core.po | 4 +-
l10n/pt_PT/files.po | 4 +-
l10n/pt_PT/files_trashbin.po | 4 +-
l10n/pt_PT/settings.po | 4 +-
l10n/pt_PT/user_ldap.po | 8 +-
l10n/ro/core.po | 4 +-
l10n/ro/files.po | 4 +-
l10n/ro/files_trashbin.po | 4 +-
l10n/ro/settings.po | 24 +--
l10n/ro/user_ldap.po | 8 +-
l10n/ru/core.po | 4 +-
l10n/ru/files.po | 4 +-
l10n/ru/files_trashbin.po | 4 +-
l10n/ru/settings.po | 26 +--
l10n/ru/user_ldap.po | 8 +-
l10n/ru_RU/core.po | 6 +-
l10n/ru_RU/files.po | 226 ++++++++++----------
l10n/ru_RU/files_trashbin.po | 39 ++--
l10n/ru_RU/settings.po | 26 +--
l10n/ru_RU/user_ldap.po | 306 +++++++++++++++++----------
l10n/si_LK/core.po | 4 +-
l10n/si_LK/files.po | 4 +-
l10n/si_LK/files_trashbin.po | 4 +-
l10n/si_LK/settings.po | 26 +--
l10n/si_LK/user_ldap.po | 8 +-
l10n/sk_SK/core.po | 4 +-
l10n/sk_SK/files.po | 4 +-
l10n/sk_SK/files_trashbin.po | 4 +-
l10n/sk_SK/settings.po | 24 +--
l10n/sk_SK/user_ldap.po | 8 +-
l10n/sl/core.po | 4 +-
l10n/sl/files.po | 4 +-
l10n/sl/files_trashbin.po | 4 +-
l10n/sl/settings.po | 24 +--
l10n/sl/user_ldap.po | 8 +-
l10n/sq/core.po | 4 +-
l10n/sq/files.po | 4 +-
l10n/sq/files_trashbin.po | 4 +-
l10n/sq/settings.po | 24 +--
l10n/sq/user_ldap.po | 6 +-
l10n/sr/core.po | 4 +-
l10n/sr/files.po | 4 +-
l10n/sr/files_trashbin.po | 4 +-
l10n/sr/settings.po | 26 +--
l10n/sr/user_ldap.po | 6 +-
l10n/sv/core.po | 4 +-
l10n/sv/files.po | 4 +-
l10n/sv/files_trashbin.po | 4 +-
l10n/sv/settings.po | 26 +--
l10n/sv/user_ldap.po | 8 +-
l10n/ta_LK/core.po | 4 +-
l10n/ta_LK/files.po | 4 +-
l10n/ta_LK/files_trashbin.po | 4 +-
l10n/ta_LK/settings.po | 26 +--
l10n/ta_LK/user_ldap.po | 6 +-
l10n/te/core.po | 4 +-
l10n/te/files.po | 4 +-
l10n/te/files_trashbin.po | 4 +-
l10n/te/settings.po | 26 +--
l10n/te/user_ldap.po | 6 +-
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 4 +-
l10n/th_TH/files.po | 4 +-
l10n/th_TH/files_trashbin.po | 4 +-
l10n/th_TH/settings.po | 26 +--
l10n/th_TH/user_ldap.po | 8 +-
l10n/tr/core.po | 4 +-
l10n/tr/files.po | 4 +-
l10n/tr/files_trashbin.po | 4 +-
l10n/tr/settings.po | 24 +--
l10n/tr/user_ldap.po | 6 +-
l10n/ug/core.po | 4 +-
l10n/ug/files.po | 4 +-
l10n/ug/files_trashbin.po | 4 +-
l10n/ug/settings.po | 4 +-
l10n/ug/user_ldap.po | 6 +-
l10n/uk/core.po | 4 +-
l10n/uk/files.po | 4 +-
l10n/uk/files_trashbin.po | 4 +-
l10n/uk/settings.po | 26 +--
l10n/uk/user_ldap.po | 8 +-
l10n/ur_PK/core.po | 4 +-
l10n/ur_PK/files.po | 4 +-
l10n/ur_PK/files_trashbin.po | 4 +-
l10n/ur_PK/settings.po | 26 +--
l10n/ur_PK/user_ldap.po | 6 +-
l10n/vi/core.po | 4 +-
l10n/vi/files.po | 4 +-
l10n/vi/files_trashbin.po | 4 +-
l10n/vi/settings.po | 26 +--
l10n/vi/user_ldap.po | 8 +-
l10n/zh_CN.GB2312/core.po | 4 +-
l10n/zh_CN.GB2312/files.po | 4 +-
l10n/zh_CN.GB2312/files_trashbin.po | 4 +-
l10n/zh_CN.GB2312/settings.po | 26 +--
l10n/zh_CN.GB2312/user_ldap.po | 8 +-
l10n/zh_CN/core.po | 4 +-
l10n/zh_CN/files.po | 4 +-
l10n/zh_CN/files_trashbin.po | 4 +-
l10n/zh_CN/settings.po | 4 +-
l10n/zh_CN/user_ldap.po | 8 +-
l10n/zh_HK/core.po | 4 +-
l10n/zh_HK/files.po | 4 +-
l10n/zh_HK/files_trashbin.po | 4 +-
l10n/zh_HK/settings.po | 26 +--
l10n/zh_HK/user_ldap.po | 8 +-
l10n/zh_TW/core.po | 4 +-
l10n/zh_TW/files.po | 4 +-
l10n/zh_TW/files_trashbin.po | 4 +-
l10n/zh_TW/settings.po | 4 +-
l10n/zh_TW/user_ldap.po | 8 +-
settings/l10n/ru_RU.php | 1 +
395 files changed, 1878 insertions(+), 1737 deletions(-)
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 6da312ae75..f34c9f59cf 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} carpetes",
"1 file" => "1 fitxer",
"{count} files" => "{count} fitxers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no và lid. L'ús de 'Shared' està reservat per Owncloud",
"Unable to rename file" => "No es pot canviar el nom del fitxer",
"Upload" => "Puja",
"File handling" => "Gestió de fitxers",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 021a210487..55dcf3640e 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} フォルダ",
"1 file" => "1 ファイル",
"{count} files" => "{count} ファイル",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ownCloudã§äºˆç´„済ã¿ã§ã™",
"Unable to rename file" => "ファイルåã®å¤‰æ›´ãŒã§ãã¾ã›ã‚“",
"Upload" => "アップãƒãƒ¼ãƒ‰",
"File handling" => "ファイルæ“作",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 400a0dc8de..1ef163d48f 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,71 +1,3 @@
<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "ÐеполучаетÑÑ Ð¿ÐµÑ€ÐµÐ½ÐµÑти %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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
-"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен чаÑтично",
-"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "ОтÑутÑтвует Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°",
-"Failed to write to disk" => "Ðе удалоÑÑŒ запиÑать на диÑк",
-"Not enough storage available" => "ÐедоÑтаточно меÑта в хранилище",
-"Invalid directory." => "Ðеверный каталог.",
-"Files" => "Файлы",
-"Share" => "Сделать общим",
-"Delete permanently" => "Удалить навÑегда",
-"Delete" => "Удалить",
-"Rename" => "Переименовать",
-"Pending" => "Ожидающий решениÑ",
-"{new_name} already exists" => "{новое_имÑ} уже ÑущеÑтвует",
-"replace" => "отмена",
-"suggest name" => "подобрать название",
-"cancel" => "отменить",
-"replaced {new_name} with {old_name}" => "заменено {новое_имÑ} Ñ {Ñтарое_имÑ}",
-"undo" => "отменить дейÑтвие",
-"perform delete operation" => "выполнÑетÑÑ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ",
-"1 file uploading" => "загрузка 1 файла",
-"'.' is an invalid file name." => "'.' ÑвлÑетÑÑ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼ именем файла.",
-"File name cannot be empty." => "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ðекорректное имÑ, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допуÑтимы.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище переполнено, фалы больше не могут быть обновлены или Ñинхронизированы!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти полно ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к Ñкачке Вашего файла. Ðто может занÑÑ‚ÑŒ некоторое времÑ, еÑли фалы большие.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ðевозможно загрузить файл,\n так как он имеет нулевой размер или ÑвлÑетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹",
-"Not enough space available" => "Ðе доÑтаточно Ñвободного меÑта",
-"Upload cancelled." => "Загрузка отменена",
-"File upload is in progress. Leaving the page now will cancel the upload." => "ПроцеÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файла. ЕÑли покинуть Ñтраницу ÑейчаÑ, загрузка будет отменена.",
-"URL cannot be empty." => "URL не должен быть пуÑтым.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸. ИÑпользование Ð½Ð°Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ 'Опубликовано' зарезервировано Owncloud",
-"Error" => "Ошибка",
-"Name" => "ИмÑ",
-"Size" => "Размер",
-"Modified" => "Изменен",
-"1 folder" => "1 папка",
-"{count} folders" => "{количеÑтво} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количеÑтво} файлов",
-"Upload" => "Загрузить ",
-"File handling" => "Работа Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸",
-"Maximum upload size" => "МакÑимальный размер загружаемого файла",
-"max. possible: " => "МакÑимально возможный",
-"Needed for multi-file and folder downloads." => "Ðеобходимо Ð´Ð»Ñ Ð¼Ð½Ð¾Ð¶ÐµÑтвенной загрузки.",
-"Enable ZIP-download" => "Включение ZIP-загрузки",
-"0 is unlimited" => "0 без ограничений",
-"Maximum input size for ZIP files" => "МакÑимальный размер входÑщих ZIP-файлов ",
-"Save" => "Сохранить",
-"New" => "Ðовый",
-"Text file" => "ТекÑтовый файл",
-"Folder" => "Папка",
-"From link" => "По ÑÑылке",
-"Cancel upload" => "Отмена загрузки",
-"Nothing in here. Upload something!" => "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!",
-"Download" => "Загрузить",
-"Unshare" => "Скрыть",
-"Upload too large" => "Загрузка Ñлишком велика",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Ð’Ñ‹ пытаетеÑÑŒ загрузить, превышает макÑимально допуÑтимый размер Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ на данный Ñервер.",
-"Files are being scanned, please wait." => "Файлы ÑканируютÑÑ, пожалуйÑта, подождите.",
-"Current scanning" => "Текущее Ñканирование",
-"Upgrading filesystem cache..." => "Обновление кÑша файловой ÑиÑтемы... "
+"Error" => "Ошибка"
);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 178eb53107..1ef163d48f 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,18 +1,3 @@
<?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s не может быть удалён навÑегда",
-"Couldn't restore %s" => "%s не может быть воÑÑтановлен",
-"perform restore operation" => "выполнить операцию воÑÑтановлениÑ",
-"Error" => "Ошибка",
-"delete file permanently" => "удалить файл навÑегда",
-"Delete permanently" => "Удалить навÑегда",
-"Name" => "ИмÑ",
-"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{количеÑтво} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количеÑтво} файлов",
-"Nothing in here. Your trash bin is empty!" => "ЗдеÑÑŒ ничего нет. Ваша корзина пуÑта!",
-"Restore" => "ВоÑÑтановить",
-"Delete" => "Удалить",
-"Deleted Files" => "Удаленные файлы"
+"Error" => "Ошибка"
);
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 4d7b7ac4ad..5f8b6b8145 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Ùشل الØØ°Ù",
+"Error" => "خطأ",
"Password" => "كلمة المرور",
"Help" => "المساعدة"
);
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index c064534a6b..0330046d80 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Грешка",
"Password" => "Парола",
"Help" => "Помощ"
);
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 69dfc89617..4cee35777d 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "সমসà§à¦¯à¦¾",
"Host" => "হোসà§à¦Ÿ",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশà§à¦¯à¦• না হলে আপনি à¦à¦‡ পà§à¦°à¦Ÿà§‹à¦•à¦²à¦Ÿà¦¿ মà§à¦›à§‡ ফেলতে পারেন । à¦à¦°à¦ªà¦° শà§à¦°à§ করà§à¦¨ à¦à¦Ÿà¦¾ দিয়ে ldaps://",
"Base DN" => "à¦à¦¿à¦¤à§à¦¤à¦¿ DN",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 8f2799b6e6..7f0849b238 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
"Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
"The configuration is valid and the connection could be established!" => "La configuració és và lida i s'ha pogut establir la comunicació!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuració és và lida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
"Keep settings?" => "Voleu mantenir la configuració?",
"Cannot add server configuration" => "No es pot afegir la configuració del servidor",
+"mappings cleared" => "s'han eliminat els mapatges",
+"Success" => "Èxit",
+"Error" => "Error",
"Connection test succeeded" => "La prova de connexió ha reeixit",
"Connection test failed" => "La prova de connexió ha fallat",
"Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuració actual del servidor?",
@@ -70,6 +74,16 @@
"Email Field" => "Camp de correu electrònic",
"User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+"Internal Username" => "Nom d'usuari intern",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els carà cters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els carà cters: [ a-zA-Z0-9_.@- ]. Els altres carà cters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+"Internal Username Attribute:" => "Atribut nom d'usuari intern:",
+"Override UUID detection" => "Sobrescriu la detecció UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits).",
+"UUID Attribute:" => "Atribut UUID:",
+"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova.",
+"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP",
"Test Configuration" => "Comprovació de la configuració",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c5d77026b9..dd7373eb69 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "PÅ™evzÃt nastavenà z nedávného nastavenà serveru?",
"Keep settings?" => "Ponechat nastavenÃ?",
"Cannot add server configuration" => "Nelze přidat nastavenà serveru",
+"Success" => "Úspěch",
+"Error" => "Chyba",
"Connection test succeeded" => "Test spojenà byl úspěšný",
"Connection test failed" => "Test spojenà selhal",
"Do you really want to delete the current Server Configuration?" => "Opravdu si pÅ™ejete smazat souÄasné nastavenà serveru?",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index 335e2109c2..abe2336b2b 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Methwyd dileu",
+"Error" => "Gwall",
"Password" => "Cyfrinair",
"Help" => "Cymorth"
);
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 9329c4e8a2..0a77f46647 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Fejl ved sletning",
+"Success" => "Succes",
+"Error" => "Fejl",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
"Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 27f5adb8b6..f001081842 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolgreich",
+"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
"Connection test failed" => "Verbindungstest fehlgeschlagen",
"Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 488d8aad7c..cfbc6a517c 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolg",
+"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
"Connection test failed" => "Verbindungstest fehlgeschlagen",
"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index e5fe6b6da7..acecf27125 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "ΠάÏτε πάνω από τις Ï€Ïόσφατες Ïυθμίσεις διαμόÏφωσης του διακομιστή?",
"Keep settings?" => "ΔιατήÏηση Ïυθμίσεων;",
"Cannot add server configuration" => "Αδυναμία Ï€Ïοσθήκης Ïυθμίσεων διακομιστή",
+"Success" => "Επιτυχία",
+"Error" => "Σφάλμα",
"Connection test succeeded" => "ΕπιτυχημÎνη δοκιμαστική σÏνδεση",
"Connection test failed" => "ΑποτυχημÎνη δοκιμαστική σÏνδεσης.",
"Do you really want to delete the current Server Configuration?" => "ΘÎλετε να διαγÏάψετε τις Ï„ÏÎχουσες Ïυθμίσεις του διακομιστή;",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 3ffcbddb3e..c9a9ba130c 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Forigo malsukcesis",
+"Success" => "Sukceso",
+"Error" => "Eraro",
"Host" => "Gastigo",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
"Base DN" => "Bazo-DN",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 098e16a5d1..c90d8fe712 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
"Keep settings?" => "Mantener la configuración?",
"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
+"Success" => "Éxito",
+"Error" => "Error",
"Connection test succeeded" => "La prueba de conexión fue exitosa",
"Connection test failed" => "La prueba de conexión falló",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
@@ -70,6 +72,7 @@
"Email Field" => "E-mail",
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "VacÃo para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda"
);
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index c8aec0cd41..98fb32b1d2 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
"Keep settings?" => "¿Mantener preferencias?",
"Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"Success" => "Éxito",
+"Error" => "Error",
"Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
"Connection test failed" => "Falló es test de conexión",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 1ee6906dfc..5f7e048e71 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
"Keep settings?" => "Säilitada seadistused?",
"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
+"Success" => "Korras",
+"Error" => "Viga",
"Connection test succeeded" => "Ühenduse testimine õnnestus",
"Connection test failed" => "Ühenduse testimine ebaõnnestus",
"Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 5e9fd014c6..42f184e539 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -7,6 +7,8 @@
"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",
+"Success" => "Arrakasta",
+"Error" => "Errorea",
"Connection test succeeded" => "Konexio froga ongi burutu da",
"Connection test failed" => "Konexio frogak huts egin du",
"Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 89fc40af4f..bef13457ad 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -3,6 +3,7 @@
"The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
"Deletion failed" => "Øذ٠کردن انجام نشد",
"Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
+"Error" => "خطا",
"Connection test succeeded" => "تست اتصال با موÙقیت انجام گردید",
"Connection test failed" => "تست اتصال ناموÙÙ‚ بود",
"Do you really want to delete the current Server Configuration?" => "آیا واقعا Ù…ÛŒ خواهید پیکربندی کنونی سرور را Øذ٠کنید؟",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38ecb5d82a..38a8b99cf7 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -2,6 +2,8 @@
"Deletion failed" => "Poisto epäonnistui",
"Keep settings?" => "Säilytetäänkö asetukset?",
"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
+"Success" => "Onnistui!",
+"Error" => "Virhe",
"Connection test succeeded" => "Yhteystesti onnistui",
"Connection test failed" => "Yhteystesti epäonnistui",
"Confirm Deletion" => "Vahvista poisto",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index ea07bd4a11..d6a6b36d56 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -6,9 +6,11 @@
"Deletion failed" => "La suppression a échoué",
"Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
"Keep settings?" => "Garder ces paramètres ?",
-"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur.",
+"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
+"Success" => "Succès",
+"Error" => "Erreur",
"Connection test succeeded" => "Test de connexion réussi",
-"Connection test failed" => "Le test de connexion a échoué",
+"Connection test failed" => "Test de connexion échoué",
"Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
"Confirm Deletion" => "Confirmer la suppression",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
@@ -17,13 +19,13 @@
"Add Server Configuration" => "Ajouter une configuration du serveur",
"Host" => "Hôte",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
-"Base DN" => "DN Racine",
+"Base DN" => "DN racine",
"One Base DN per line" => "Un DN racine par ligne",
"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
"User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
"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 de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
"Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
"User Login Filter" => "Modèle d'authentification utilisateurs",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
@@ -66,10 +68,12 @@
"Special Attributes" => "Attributs spéciaux",
"Quota Field" => "Champ du quota",
"Quota Default" => "Quota par défaut",
-"in bytes" => "en octets",
+"in bytes" => "en bytes",
"Email Field" => "Champ Email",
"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
+"Internal Username" => "Nom d'utilisateur interne",
+"UUID Attribute:" => "Attribut UUID :",
"Test Configuration" => "Tester la configuration",
"Help" => "Aide"
);
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 215d518e7a..3f44ccd9bd 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Non foi posÃbel limpar as asignacións.",
"Failed to delete the server configuration" => "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.",
@@ -7,6 +8,9 @@
"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",
+"mappings cleared" => "limpadas as asignacións",
+"Success" => "Correcto",
+"Error" => "Erro",
"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?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo do correo",
"User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
"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.",
+"Internal Username" => "Nome de usuario interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omÃtense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"Internal Username Attribute:" => "Atributo do nome de usuario interno:",
+"Override UUID detection" => "Ignorar a detección do UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"UUID Attribute:" => "Atributo do UUID:",
+"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para asà reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensÃbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»",
"Test Configuration" => "Probar a configuración",
"Help" => "Axuda"
);
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 97259a0ddd..0d60768dcf 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -2,6 +2,7 @@
"Deletion failed" => "מחיקה × ×›×©×œ×”",
"Keep settings?" => "×”×× ×œ×©×ž×•×¨ ×ת ההגדרות?",
"Cannot add server configuration" => "×œ× × ×™×ª×Ÿ להוסיף ×ת הגדרות השרת",
+"Error" => "שגי××”",
"Connection test succeeded" => "בדיקת החיבור עברה בהצלחה",
"Connection test failed" => "בדיקת החיבור × ×›×©×œ×”",
"Do you really want to delete the current Server Configuration?" => "×”×× ×כן למחוק ×ת הגדרות השרת ×”× ×•×›×—×™×•×ª?",
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index 005a76d4bb..cc8918301f 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Greška",
"Password" => "Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index a82a64ab32..cbbcc69ede 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -7,6 +7,7 @@
"Take over settings from recent server configuration?" => "Vegyük át a beállÃtásokat az elÅ‘zÅ‘ konfigurációból?",
"Keep settings?" => "Tartsuk meg a beállÃtásokat?",
"Cannot add server configuration" => "Az új kiszolgáló konfigurációja nem hozható létre",
+"Error" => "Hiba",
"Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
"Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállÃtásait?",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 38374abda7..624fd4fa0e 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Error",
"Password" => "Contrasigno",
"Help" => "Adjuta"
);
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 5f76d6b99f..c04d09fc67 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -7,6 +7,8 @@
"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",
+"Success" => "Sukses",
+"Error" => "Galat",
"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?",
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 29bc769279..dadac9eeda 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Villa",
"Host" => "Netþjónn",
"Password" => "Lykilorð",
"Help" => "Hjálp"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index a2790fd1de..5a7e682ec9 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
"Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
"The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
"Keep settings?" => "Vuoi mantenere le impostazioni?",
"Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
+"mappings cleared" => "associazioni cancellate",
+"Success" => "Riuscito",
+"Error" => "Errore",
"Connection test succeeded" => "Prova di connessione riuscita",
"Connection test failed" => "Prova di connessione non riuscita",
"Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
@@ -70,6 +74,13 @@
"Email Field" => "Campo Email",
"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+"Internal Username" => "Nome utente interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+"Internal Username Attribute:" => "Attributo nome utente interno:",
+"UUID Attribute:" => "Attributo UUID:",
+"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
+"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
"Test Configuration" => "Prova configurazione",
"Help" => "Aiuto"
);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 8239ecf3cc..6d5008b65b 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "マッピングã®ã‚¯ãƒªã‚¢ã«å¤±æ•—ã—ã¾ã—ãŸã€‚",
"Failed to delete the server configuration" => "サーãƒè¨å®šã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ",
"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." => "è¨å®šã¯æœ‰åŠ¹ã§ã™ãŒã€æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒè¨å®šã¨è³‡æ ¼æƒ…å ±ã‚’ç¢ºèªã—ã¦ä¸‹ã•ã„。",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "最近ã®ã‚µãƒ¼ãƒè¨å®šã‹ã‚‰è¨å®šã‚’引ã継ãŽã¾ã™ã‹ï¼Ÿ",
"Keep settings?" => "è¨å®šã‚’ä¿æŒã—ã¾ã™ã‹ï¼Ÿ",
"Cannot add server configuration" => "サーãƒè¨å®šã‚’è¿½åŠ ã§ãã¾ã›ã‚“",
+"mappings cleared" => "マッピングをクリアã—ã¾ã—ãŸ",
+"Success" => "æˆåŠŸ",
+"Error" => "エラー",
"Connection test succeeded" => "接続テストã«æˆåŠŸã—ã¾ã—ãŸ",
"Connection test failed" => "接続テストã«å¤±æ•—ã—ã¾ã—ãŸ",
"Do you really want to delete the current Server Configuration?" => "ç¾åœ¨ã®ã‚µãƒ¼ãƒè¨å®šã‚’本当ã«å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ",
@@ -70,6 +74,15 @@
"Email Field" => "メールフィールド",
"User Home Folder Naming Rule" => "ユーザã®ãƒ›ãƒ¼ãƒ フォルダ命åè¦å‰‡",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザåを空ã®ã¾ã¾ã«ã—ã¦ãã ã•ã„（デフォルト）。ãã†ã§ãªã„å ´åˆã¯ã€LDAPã‚‚ã—ãã¯ADã®å±žæ€§ã‚’指定ã—ã¦ãã ã•ã„。",
+"Internal Username" => "内部ユーザå",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトã§ã¯ã€å†…部ユーザåã¯UUID属性ã‹ã‚‰ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶åãŒãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚Šã€ã‹ã¤æ–‡å—ã®å¤‰æ›ãŒå¿…è¦ãªã„ã“ã¨ã‚’ä¿è¨¼ã—ã¾ã™ã€‚内部ユーザåã«ã¯ã€[ a-zA-Z0-9_.@- ] ã®æ–‡å—ã®ã¿ãŒæœ‰åŠ¹ã§ã‚ã‚‹ã¨ã„ã†åˆ¶é™ãŒã‚ã‚Šã€ãã®ä»–ã®æ–‡å—ã¯å¯¾å¿œã™ã‚‹ ASCII コードã«å¤‰æ›ã•ã‚Œã‚‹ã‹å˜ã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ãã®ãŸã‚ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶åã¨ã®è¡çªã®å›žæ•°ãŒå¢—åŠ ã™ã‚‹ã§ã—ょã†ã€‚内部ユーザåã¯ã€å†…部的ã«ãƒ¦ãƒ¼ã‚¶ã‚’è˜åˆ¥ã™ã‚‹ãŸã‚ã«ç”¨ã„られã€ã¾ãŸã€ownCloudã«ãŠã‘るデフォルトã®ãƒ›ãƒ¼ãƒ フォルダåã¨ã—ã¦ã‚‚用ã„られã¾ã™ã€‚例ãˆã°*DAVサービスã®ã‚ˆã†ã«ã€ãƒªãƒ¢ãƒ¼ãƒˆURLã®ãƒãƒ¼ãƒˆã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ã“ã®è¨å®šã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã‚’å†å®šç¾©ã—ã¾ã™ã€‚ownCloud 5 以å‰ã¨åŒã˜ã‚ˆã†ãªæŒ¯ã‚‹èˆžã„ã«ã™ã‚‹ãŸã‚ã«ã¯ã€ä»¥ä¸‹ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®å±žæ€§ã‚’入力ã—ã¾ã™ã€‚空ã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚変更ã¯æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPユーザã«ãŠã„ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
+"Internal Username Attribute:" => "内部ユーザå属性:",
+"Override UUID detection" => "UUID検出をå†å®šç¾©ã™ã‚‹",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトã§ã¯ã€ownCloud 㯠UUID 属性を自動的ã«æ¤œå‡ºã—ã¾ã™ã€‚UUID属性ã¯ã€LDAPユーザã¨LDAPグループを間é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“れを指定ã—ãªã„å ´åˆã¯ã€å†…部ユーザåã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’用ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。空ã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚変更ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPユーザã¨LDAPグループã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
+"UUID Attribute:" => "UUID属性:",
+"Username-LDAP User Mapping" => "ユーザåã¨LDAPユーザã®ãƒžãƒƒãƒ”ング",
+"Clear Username-LDAP User Mapping" => "ユーザåã¨LDAPユーザã®ãƒžãƒƒãƒ”ングをクリアã™ã‚‹",
+"Clear Groupname-LDAP Group Mapping" => "グループåã¨LDAPグループã®ãƒžãƒƒãƒ”ングをクリアã™ã‚‹",
"Test Configuration" => "è¨å®šã‚’テスト",
"Help" => "ヘルプ"
);
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index b3f6058a0c..8057f7c845 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "დáƒáƒ‘რუნდებით სერვერის წინრკáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒáƒ¨áƒ˜?",
"Keep settings?" => "დáƒáƒ•áƒ¢áƒáƒ•áƒáƒ— პáƒáƒ áƒáƒ›áƒ”ტრები?",
"Cannot add server configuration" => "სერვერის პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ›áƒáƒ¢áƒ”ბრვერმáƒáƒ®áƒ”რხდáƒ",
+"Success" => "დáƒáƒ¡áƒ ულდáƒ",
+"Error" => "შეცდáƒáƒ›áƒ",
"Connection test succeeded" => "კáƒáƒ•áƒ¨áƒ˜áƒ ის ტესტირებრმáƒáƒ®áƒ”რხდáƒ",
"Connection test failed" => "კáƒáƒ•áƒ¨áƒ˜áƒ ის ტესტირებრვერმáƒáƒ®áƒ”რხდáƒ",
"Do you really want to delete the current Server Configuration?" => "ნáƒáƒ›áƒ“ვილáƒáƒ“ გინდáƒáƒ— წáƒáƒ¨áƒáƒšáƒáƒ— სერვერის მიმდინáƒáƒ ე პáƒáƒ áƒáƒ›áƒ”ტრები?",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 8aa9fe74b3..b8196e09d0 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "ì‚ì œ 실패",
"Keep settings?" => "ì„¤ì •ì„ ìœ ì§€í•©ë‹ˆê¹Œ?",
+"Error" => "오류",
"Connection test succeeded" => "연결 시험 성공",
"Connection test failed" => "연결 시험 실패",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>ê²½ê³ :</b> user_ldap 앱과 user_webdavauth ì•±ì€ í˜¸í™˜ë˜ì§€ 않습니다. 오ë™ìž‘ì„ ì¼ìœ¼í‚¬ 수 있으므로, 시스템 관리ìžì—게 ìš”ì²í•˜ì—¬ 둘 중 하나만 사용하ë„ë¡ í•˜ì‹ì‹œì˜¤.",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index f8f893834b..00602ae5d7 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"Success" => "سه‌رکه‌وتن",
+"Error" => "هه‌ڵه",
"Password" => "وشەی تێپەربو",
"Help" => "یارمەتی"
);
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index 39ed627ce2..cf58c9ec5b 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Konnt net läschen",
+"Error" => "Fehler",
"Password" => "Passwuert",
"Help" => "Hëllef"
);
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index aa21dd2d3c..6f396847b8 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "IÅ¡trinti nepavyko",
+"Error" => "Klaida",
"Password" => "Slaptažodis",
"Group Filter" => "GrupÄ—s filtras",
"Port" => "Prievadas",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 50126664e5..73ffedcb13 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -7,6 +7,7 @@
"Take over settings from recent server configuration?" => "Paņemt iestatÄ«jumus no nesenas servera konfigurÄcijas?",
"Keep settings?" => "Paturēt iestatījumus?",
"Cannot add server configuration" => "Nevar pievienot servera konfigurÄciju",
+"Error" => "Kļūda",
"Connection test succeeded" => "Savienojuma tests ir veiksmīgs",
"Connection test failed" => "Savienojuma tests cieta neveiksmi",
"Do you really want to delete the current Server Configuration?" => "Vai tieÅ¡Äm vÄ“laties dzÄ“st paÅ¡reizÄ“jo servera konfigurÄciju?",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 7d34ff4949..6a060aca41 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Бришењето е неуÑпешно",
+"Error" => "Грешка",
"Host" => "Домаќин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го Ñкокнете протколот оÑвен ако не ви треба SSL. Тогаш Ñтавете ldaps://",
"Password" => "Лозинка",
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 88ed18346c..b3004028c5 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Pemadaman gagal",
+"Error" => "Ralat",
"Password" => "Kata laluan",
"Help" => "Bantuan"
);
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index c4700245f2..f8cdf694ff 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
"Keep settings?" => "Behold innstillinger?",
"Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"Success" => "Suksess",
+"Error" => "Feil",
"Connection test succeeded" => "Tilkoblingstest lyktes",
"Connection test failed" => "Tilkoblingstest mislyktes",
"Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 7973c66cd1..c935d387cc 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
"Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
"The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
"Keep settings?" => "Instellingen bewaren?",
"Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
+"mappings cleared" => "vertaaltabel leeggemaakt",
+"Success" => "Succes",
+"Error" => "Fout",
"Connection test succeeded" => "Verbindingstest geslaagd",
"Connection test failed" => "Verbindingstest mislukt",
"Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
@@ -70,6 +74,13 @@
"Email Field" => "E-mailveld",
"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+"Internal Username" => "Interne gebruikersnaam",
+"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
+"Override UUID detection" => "Negeren UUID detectie",
+"UUID Attribute:" => "UUID Attribuut:",
+"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
"Test Configuration" => "Test configuratie",
"Help" => "Help"
);
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 9f84258c56..4591002280 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Feil ved sletting",
+"Error" => "Feil",
"Password" => "Passord",
"Help" => "Hjelp"
);
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 49b6c5970c..95ab51caad 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Fracàs d'escafatge",
+"Error" => "Error",
"Password" => "Senhal",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index a5b620e48b..a7a831e3e5 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
"Keep settings?" => "Zachować ustawienia?",
"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
+"Success" => "Sukces",
+"Error" => "BÅ‚Ä…d",
"Connection test succeeded" => "Test połączenia udany",
"Connection test failed" => "Test połączenia nie udany",
"Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index a728ea15fd..22247b8100 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
"Failed to delete the server configuration" => "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.",
@@ -7,6 +8,9 @@
"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
"Keep settings?" => "Manter ajustes?",
"Cannot add server configuration" => "ImpossÃvel adicionar a configuração do servidor",
+"mappings cleared" => "mapeamentos limpos",
+"Success" => "Sucesso",
+"Error" => "Erro",
"Connection test succeeded" => "Teste de conexão bem sucedida",
"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?",
@@ -70,6 +74,16 @@
"Email Field" => "Campo de Email",
"User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
"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.",
+"Internal Username" => "Nome de usuário interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituÃdas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. ",
+"Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
+"Override UUID detection" => "Substituir detecção UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensÃveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental.",
+"Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo",
"Test Configuration" => "Teste de Configuração",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 02b03d5a75..ed1e0f376d 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
"Keep settings?" => "Manter as definições?",
"Cannot add server configuration" => "Não foi possÃvel adicionar as configurações do servidor.",
+"Success" => "Sucesso",
+"Error" => "Erro",
"Connection test succeeded" => "Teste de conecção passado com sucesso.",
"Connection test failed" => "Erro no teste de conecção.",
"Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 8f55a35b49..260ee61063 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Ștergerea a eșuat",
+"Success" => "Succes",
+"Error" => "Eroare",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
"Host" => "Gazdă",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0746e1e892..eed6d373b9 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "ПринÑÑ‚ÑŒ наÑтройки из поÑледней конфигурации Ñервера?",
"Keep settings?" => "Сохранить наÑтройки?",
"Cannot add server configuration" => "Ðе получилоÑÑŒ добавить конфигурацию Ñервера",
+"Success" => "УÑпешно",
+"Error" => "Ошибка",
"Connection test succeeded" => "Проверка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ",
"Connection test failed" => "Проверка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ удалаÑÑŒ",
"Do you really want to delete the current Server Configuration?" => "Ð’Ñ‹ дейÑтвительно хотите удалить ÑущеÑтвующую конфигурацию Ñервера?",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index a4ed503b1d..7b6833ebf8 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,42 +1,4 @@
<?php $TRANSLATIONS = array(
-"Deletion failed" => "Удаление не удалоÑÑŒ",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap и user_webdavauth неÑовмеÑтимы. Ð’Ñ‹ можете ÑтолкнутьÑÑ Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¼ поведением ÑиÑтемы. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из них.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Модуль PHP LDAP не уÑтановлен, бÑкÑнд не будет работать. ПожалуйÑта, обратитеÑÑŒ к Вашему ÑиÑтемному админиÑтратору, чтобы уÑтановить его.",
-"Host" => "ХоÑÑ‚",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Ð’Ñ‹ можете пропуÑтить протокол, еÑли Вам не требуетÑÑ SSL. Затем начните Ñ ldaps://",
-"Base DN" => "База DN",
-"One Base DN per line" => "Одно базовое DN на линию",
-"You can specify Base DN for users and groups in the Advanced tab" => "Ð’Ñ‹ можете задать Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп во вкладке «Дополнительно»",
-"User DN" => "DN пользователÑ",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN клиентÑкого пользователÑ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ должна оÑущеÑтвлÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸Ð²Ñзка, например, uid=agent,dc=example,dc=com. Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ доÑтупа оÑтавьте Ð¿Ð¾Ð»Ñ DN и Пароль пуÑтыми.",
-"Password" => "Пароль",
-"For anonymous access, leave DN and Password empty." => "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ доÑтупа оÑтавьте Ð¿Ð¾Ð»Ñ DN и пароль пуÑтыми.",
-"User Login Filter" => "Фильтр имен пользователей",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Задает фильтр, применÑемый при загрузке пользователÑ. %%uid заменÑет Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ входе.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "иÑпользуйте %%uid заполнитель, например, \"uid=%%uid\"",
-"User List Filter" => "Фильтр ÑпиÑка пользователей",
-"Defines the filter to apply, when retrieving users." => "Задает фильтр, применÑемый при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
-"Group Filter" => "Групповой фильтр",
-"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применÑемый при получении групп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
-"Port" => "Порт",
-"Use TLS" => "ИÑпользовать TLS",
-"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." => "в Ñекундах. Изменение очищает кÑш.",
-"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" => "Одно пользовательÑкое базовое DN на линию",
-"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" => "Одно групповое базовое DN на линию",
-"Group-Member association" => "СвÑзь член-группа",
-"in bytes" => "в байтах",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ОÑтавьте пуÑтым под Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (по умолчанию). Ð’ противном Ñлучае задайте LDAP/AD атрибут.",
-"Help" => "Помощь"
+"Success" => "УÑпех",
+"Error" => "Ошибка"
);
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 50124e4d54..1d81b341b4 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "මකà·à¶¯à·à¶¸à·“ම අසà·à¶»à·Šà¶®à¶šà¶ºà·’",
+"Success" => "à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’",
+"Error" => "දà·à·‚යක්",
"Host" => "à·ƒà¶à·Šà¶šà·à¶»à¶šà¶º",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවà·à·Šâ€à¶ºà¶º වන විට පමණක් à·„à·à¶», අන් අවස්ථà·à·€à¶±à·Šà·„ිදී ප්â€à¶»à·œà¶§à·œà¶šà·à¶½à¶º අà¶à·Š à·„à·à¶»à·’ය à·„à·à¶š. භà·à·€à·’à¶à· කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
"Password" => "මුර පදය",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index cb55762e64..b31fe37756 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
"Keep settings?" => "Ponechať nastavenia?",
"Cannot add server configuration" => "Nemožno pridať nastavenie servera",
+"Success" => "Úspešné",
+"Error" => "Chyba",
"Connection test succeeded" => "Test pripojenia bol úspešný",
"Connection test failed" => "Test pripojenia zlyhal",
"Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazaÅ¥ súÄasné nastavenie servera?",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 8ff1fd5344..1ade5d9b73 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?",
"Keep settings?" => "Ali nas se nastavitve ohranijo?",
"Cannot add server configuration" => "Ni mogoÄe dodati nastavitev strežnika",
+"Success" => "UspeÅ¡no konÄano.",
+"Error" => "Napaka",
"Connection test succeeded" => "Preizkus povezave je uspeÅ¡no konÄan.",
"Connection test failed" => "Preizkus povezave je spodletel.",
"Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 24fd869057..12324b9f96 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "Veprim i gabuar",
"Password" => "Kodi",
"Help" => "Ndihmë"
);
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 52569a08ef..b94bc83e1e 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "БриÑање није уÑпело",
+"Error" => "Грешка",
"Host" => "Домаћин",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоÑтавите протокол, оÑим ако захтевате SSL. У том Ñлучају почните Ñа ldaps://.",
"Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 1bb4d9dc0b..eb30bd22f0 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
"Keep settings?" => "Behåll inställningarna?",
"Cannot add server configuration" => "Kunde inte lägga till serverinställning",
+"Success" => "Lyckat",
+"Error" => "Fel",
"Connection test succeeded" => "Anslutningstestet lyckades",
"Connection test failed" => "Anslutningstestet misslyckades",
"Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index f6beb3c486..997f09ca87 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "நீகà¯à®•à®®à¯ தோலà¯à®µà®¿à®¯à®Ÿà¯ˆà®¨à¯à®¤à®¤à¯",
+"Error" => "வழà¯",
"Host" => "ஓமà¯à®ªà¯à®©à®°à¯",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "நீஙà¯à®•à®³à¯ SSL சேவையை தவிர உடனà¯à®ªà®Ÿà¯ வரைமà¯à®±à¯ˆà®¯à¯ˆ தவிரà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. பிறக௠ldaps:.// உடன௠ஆரமà¯à®ªà®¿à®•à¯à®•à®µà¯à®®à¯",
"Base DN" => "தள DN",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index d9a3e713f0..3f047631cf 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "పొరపాటà±",
"Password" => "సంకేతపదం",
"Help" => "సహాయం"
);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 802badb2f0..ec279ba01e 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -6,6 +6,8 @@
"Deletion failed" => "à¸à¸²à¸£à¸¥à¸šà¸—ิ้งล้มเหลว",
"Keep settings?" => "รัà¸à¸©à¸²à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าไว้?",
"Cannot add server configuration" => "ไม่สามารถเพิ่มค่าà¸à¸³à¸«à¸™à¸”เซิร์ฟเวà¸à¸£à¹Œà¹„ด้",
+"Success" => "เสร็จสิ้น",
+"Error" => "ข้à¸à¸œà¸´à¸”พลาด",
"Connection test succeeded" => "ทดสà¸à¸šà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸³à¹€à¸£à¹‡à¸ˆ",
"Connection test failed" => "ทดสà¸à¸šà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
"Do you really want to delete the current Server Configuration?" => "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¹à¸¥à¹‰à¸§à¸«à¸£à¸·à¸à¸§à¹ˆà¸²à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸—ิ้งไป?",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 6f75f4371d..c001fa99ce 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -7,6 +7,7 @@
"Take over settings from recent server configuration?" => "Parametri sonadan uyunlama cikarmak mi?",
"Keep settings?" => "Ayarları kalsınmı?",
"Cannot add server configuration" => "Sunucu uyunlama birlemek edemen. ",
+"Error" => "Hata",
"Connection test succeeded" => "Bağlantı testi başarılı oldu",
"Connection test failed" => "Bağlantı testi başarısız oldu",
"Do you really want to delete the current Server Configuration?" => "Hakikatten, Sonuncu Funksyon durmak istiyor mi?",
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 05a7a3f9a0..8634cdbe1b 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
+"Error" => "خاتالىق",
"Host" => "باش ئاپپارات",
"Password" => "ئىم",
"User Login Filter" => "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 623d34c98e..f92c6d5894 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "ЗаÑтоÑувати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· оÑтанньої конфігурації Ñервера ?",
"Keep settings?" => "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ?",
"Cannot add server configuration" => "Ðеможливо додати конфігурацію Ñервера",
+"Success" => "УÑпіх",
+"Error" => "Помилка",
"Connection test succeeded" => "Перевірка з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð¹ÑˆÐ»Ð° уÑпішно",
"Connection test failed" => "Перевірка з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ неуÑпішно",
"Do you really want to delete the current Server Configuration?" => "Ви дійÑно бажаєте видалити поточну конфігурацію Ñервера ?",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 4c606a1380..83570a596a 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Error" => "ایرر",
"Password" => "پاسورڈ",
"Help" => "مدد"
);
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 4bbb977f36..7e59822592 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "Xóa thất bại",
+"Success" => "Thà nh công",
+"Error" => "Lá»—i",
"Host" => "Máy chủ",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỠqua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
"Base DN" => "DN cơ bản",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index f5bc41fd46..6c60ec64e2 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "åˆ é™¤å¤±è´¥",
+"Success" => "æˆåŠŸ",
+"Error" => "出错",
"Host" => "主机",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您å¯ä»¥å¿½ç•¥å议，除éžæ‚¨éœ€è¦ SSL。然åŽç”¨ ldaps:// 开头",
"Base DN" => "基本判别å",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 1911734805..7b8389227a 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -7,6 +7,8 @@
"Take over settings from recent server configuration?" => "从近期的æœåŠ¡å™¨é…ç½®ä¸å¯¼å…¥è®¾ç½®ï¼Ÿ",
"Keep settings?" => "ä¿ç•™è®¾ç½®å—？",
"Cannot add server configuration" => "æ— æ³•æ·»åŠ æœåŠ¡å™¨é…ç½®",
+"Success" => "æˆåŠŸ",
+"Error" => "错误",
"Connection test succeeded" => "连接测试æˆåŠŸ",
"Connection test failed" => "连接测试失败",
"Do you really want to delete the current Server Configuration?" => "您真的想è¦åˆ 除当å‰æœåŠ¡å™¨é…ç½®å—？",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index 190e4eba79..ba55c41479 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"Success" => "æˆåŠŸ",
+"Error" => "錯誤",
"Password" => "密碼",
"Port" => "é€£æŽ¥åŸ ",
"Help" => "幫助"
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 9a12bad074..d01e75356c 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
<?php $TRANSLATIONS = array(
"Deletion failed" => "移除失敗",
+"Success" => "æˆåŠŸ",
+"Error" => "錯誤",
"Host" => "主機",
"Password" => "密碼",
"Port" => "連接阜",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 8fb568aee7..d43ee8cf54 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Settings" => "ÐаÑтройки"
+"Settings" => "ÐаÑтройки",
+"Error" => "Ошибка"
);
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 9442b987a2..06a5795244 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 4e209e0c8e..0136882b87 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 7687fcb555..de67c217d3 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 4f9b7f9cb4..e0f912c9ba 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "تم التØديث بنجاØ"
msgid "Saving..."
msgstr "جاري الØÙظ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "تم الØØ°Ù"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "تراجع"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "تعذر Øذ٠المستخدم"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "مجموعات"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "إلغاء"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "اضاÙØ© مجموعة"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "يجب ادخال اسم مستخدم صØÙŠØ"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Øصل خطأ اثناء انشاء مستخدم"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صØÙŠØØ©"
@@ -328,7 +328,7 @@ msgstr "أقل"
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 42658b5c8d..459d3c4da5 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "خطأ"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index eb67822397..7d6092b5f4 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 0d49d30e76..160de033ba 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index a2db650ea7..76a4f6c926 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e6571146d9..e6d0abbf85 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Обновено"
msgid "Saving..."
msgstr "ЗапиÑване..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "изтрито"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "възтановÑване"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Изтриване"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "нова група"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "По-малко"
msgid "Version"
msgstr "ВерÑиÑ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 834df076cc..0859379edb 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Грешка"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 59b3c25b06..ffb1faa6bd 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index ff66538e58..25a098953c 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index effbaf5571..01a1615790 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 3a12193247..e0081ad76a 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "সংরকà§à¦·à¦£ করা হচà§à¦›à§‡.."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "গোষà§à¦ ীসমূহ"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "গোষà§à¦ ী পà§à¦°à¦¶à¦¾à¦¸à¦•"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "মà§à¦›à§‡"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "কম"
msgid "Version"
msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index a868139a96..470c3d630b 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "সমসà§à¦¯à¦¾"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 5eacd2f6a0..fe0bd380da 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 21:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index b131f8debd..cf8af961c9 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+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"
@@ -217,7 +218,7 @@ msgstr "{count} fitxers"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nom de carpeta no và lid. L'ús de 'Shared' està reservat per Owncloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index b91a1a13b3..af988ccbae 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index d2c9ab2cd8..0d6054fa5b 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 21:40+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+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"
@@ -125,44 +125,44 @@ msgstr "Actualitzada"
msgid "Saving..."
msgstr "Desant..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "esborrat"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "desfés"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grups"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Esborra"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "afegeix grup"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Heu de facilitar un nom d'usuari và lid"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Error en crear l'usuari"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya và lida"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index a817cb8212..b664c8a830 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 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"
@@ -19,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Ha fallat en eliminar els mapatges"
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,15 +60,15 @@ msgstr "No es pot afegir la configuració del servidor"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "s'han eliminat els mapatges"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Èxit"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Error"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -342,7 +343,7 @@ msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu u
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Nom d'usuari intern"
#: templates/settings.php:102
msgid ""
@@ -358,15 +359,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els carà cters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els carà cters: [ a-zA-Z0-9_.@- ]. Els altres carà cters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atribut nom d'usuari intern:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Sobrescriu la detecció UUID"
#: templates/settings.php:105
msgid ""
@@ -377,15 +378,15 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits)."
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atribut UUID:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
#: templates/settings.php:108
msgid ""
@@ -400,15 +401,15 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 275c6f62f9..48fbe83a66 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 06:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 38b1eebdac..f164d72836 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index be29385223..ce5f4e645f 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index d0c227483e..9af35dfb21 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Aktualizováno"
msgid "Saving..."
msgstr "Ukládám..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "smazáno"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "zpět"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Smazat"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "přidat skupinu"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "MusÃte zadat platné uživatelské jméno"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Chyba při vytvářenà užiatele"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "MusÃte zadat platné heslo"
@@ -328,7 +328,7 @@ msgstr "Méně"
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 4cfd61fae8..70baa024a0 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Úspěch"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Chyba"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 2d3c304cc3..2afb7a5ea8 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 3c28222335..32f11d2044 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 675605ebaf..e1cc6bccb9 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/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-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 14:48+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index bb6e0180eb..3d0b6fb4d4 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 15:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Yn cadw..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "dadwneud"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grwpiau"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Dileu"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 06a1259571..193441f938 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Gwall"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 5d4fa6016a..a7b1bd9925 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 3fcfd963c4..36c60585d2 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index cad9f8798d..05219a3d19 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index a81909c3c7..0d668d9af3 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 13:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Opdateret"
msgid "Saving..."
msgstr "Gemmer..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "Slettet"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "fortryd"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Slet"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "Tilføj gruppe"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Et gyldigt brugernavn skal angives"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Fejl ved oprettelse af bruger"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 39368c8e4a..0d1223e965 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Succes"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fejl"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 87d896ee48..dbe7d0f5ad 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-11 17:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index fb3a8aac6c..2a33c07223 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 57df6038e8..fb1fdac414 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:58+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 4a545152ee..d161a392cc 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index ed38865213..be5f6d9eb1 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Erfolgreich"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 6d6212bdec..f6939d83e5 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/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-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 16:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 8560a8f9a2..9dc6112859 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/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-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index f05c61535a..4cdafce673 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:58+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 9e82862dc2..860895432a 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 21:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 4fbd1dd320..b9b4139d8c 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Erfolg"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index e5c54f4c71..adff3efe96 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 6f2c4fcdfa..78423ef928 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e4bef56ec1..05b9266f9e 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 120f0a31d1..9103a1e0fc 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "ΕνημεÏώθηκε"
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "διαγÏάφηκε"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "αναίÏεση"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίÏεση χÏήστη"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Ομάδες"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Ομάδα ΔιαχειÏιστών"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "ΔιαγÏαφή"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "Ï€Ïοσθήκη ομάδας"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Î ÏÎπει να δοθεί ÎγκυÏο όνομα χÏήστη"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Σφάλμα δημιουÏγίας χÏήστη"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό"
@@ -329,7 +329,7 @@ msgstr "ΛιγότεÏα"
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index e333d516ca..815d1c8291 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Επιτυχία"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Σφάλμα"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index e012849caa..3fc75e6110 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 780fab4f57..bc5988ea85 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index df836da8a1..edd0e86b30 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 24fba7f1cb..5103daa931 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Konservante..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "forigita"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "malfari"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Forigi"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Malpli"
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 02508217bc..2a5527f375 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Sukceso"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Eraro"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index adabbb6ddd..2a2a9f9f82 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 16:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: ggam <ggam@brainleakage.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index a5ff79e96b..eff94d9cc9 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 85d553be40..06773f7cd2 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 01d9ecc822..4c899470e4 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 18:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: ggam <ggam@brainleakage.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -126,44 +126,44 @@ msgstr "Actualizado"
msgid "Saving..."
msgstr "Guardando..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "borrado"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "deshacer"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "No se puede eliminar el usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupo administrador"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Eliminar"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "añadir Grupo"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Se debe usar un nombre de usuario válido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Error al crear usuario"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Se debe usar una contraseña valida"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 2fec96620a..9a296337a0 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ordenet <roberto@ordenet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 22:50+0000\n"
+"Last-Translator: ordenet <roberto@ordenet.com>\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"
@@ -63,11 +64,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Éxito"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Error"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -400,7 +401,7 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 1e5bebb11e..c0ae45f5a3 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 1341e2989f..4fcd61af4c 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 3912933c0c..6677f0c624 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 7e2eabe42c..ad3097053d 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Actualizado"
msgid "Saving..."
msgstr "Guardando..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "borrado"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "deshacer"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Imposible remover usuario"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Borrar"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "Agregar grupo"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Debe ingresar un nombre de usuario válido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Error creando usuario"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Debe ingresar una contraseña válida"
@@ -328,7 +328,7 @@ msgstr "Menos"
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 2f2f7af291..9912a5ca2b 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Éxito"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Error"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 0a1d8b4be0..a03e773beb 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 09:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index cddc2e6137..3084922f77 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 06:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 9e8889d3a7..655ddff375 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:11+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 74945ae86c..8ba6e31707 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 08:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 9cc73eb82e..bb06a54edc 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Korras"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Viga"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 7f5af267bd..930dc72fd7 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index fd7b57bfd4..df564bee56 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index d86ad26b2e..d29b34cf73 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 229680c871..6c4e25ee0a 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Eguneratuta"
msgid "Saving..."
msgstr "Gordetzen..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "ezabatuta"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "desegin"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Ezabatu"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "gehitu taldea"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Baliozko erabiltzaile izena eman behar da"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Errore bat egon da erabiltzailea sortzean"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
@@ -328,7 +328,7 @@ msgstr "Gutxiago"
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 95bbdedaee..c0a31304c6 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Arrakasta"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Errorea"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 5e282fc91e..b399c5fbc0 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index d066b537fc..ca53e5b2c9 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index b513c23be8..adcafe886a 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index a962359623..2b0be04165 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "بروز رسانی انجام شد"
msgid "Saving..."
msgstr "در Øال ذخیره سازی..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "Øذ٠شده"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "بازگشت"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Øذ٠کاربر امکان پذیر نیست"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "گروه ها"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "ØØ°Ù"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "اÙزودن گروه"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "نام کاربری صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "خطا در ایجاد کاربر"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "رمز عبور صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود"
@@ -328,7 +328,7 @@ msgstr "کم‌تر"
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index f4363d8fdc..4a8fe98a4c 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "خطا"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 36d65066e3..0110a051c4 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 8ef0a08d51..d1f62c02c7 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index c076a783a1..b3da91aeff 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 75d1540673..52d5c8723a 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Päivitetty"
msgid "Saving..."
msgstr "Tallennetaan..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "poistettu"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "kumoa"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Poista"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "lisää ryhmä"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Virhe käyttäjää luotaessa"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -329,7 +329,7 @@ msgstr "Vähemmän"
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index e812025830..0bfc9766d9 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Onnistui!"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Virhe"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b88d8fd850..62215da210 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-10 01:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: msoko <sokolovitch@yahoo.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index f32e533d5a..aef01563f9 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index eaa5def5c6..1116a5b394 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index dbd916ae19..d6ec6b40d0 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Mise à jour effectuée avec succès"
msgid "Saving..."
msgstr "Enregistrement..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "supprimé"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "annuler"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Supprimer"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "ajouter un groupe"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Un nom d'utilisateur valide doit être saisi"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Erreur lors de la création de l'utilisateur"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
@@ -329,7 +329,7 @@ msgstr "Moins"
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 7ff7eb9939..066ed1f420 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 22:20+0000\n"
+"Last-Translator: RyDroid <rydroid_trans@yahoo.fr>\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"
@@ -55,7 +55,7 @@ msgstr "Garder ces paramètres ?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr "Impossible d'ajouter la configuration du serveur."
+msgstr "Impossible d'ajouter la configuration du serveur"
#: js/settings.js:111
msgid "mappings cleared"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Succès"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Erreur"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -75,7 +75,7 @@ msgstr "Test de connexion réussi"
#: js/settings.js:146
msgid "Connection test failed"
-msgstr "Le test de connexion a échoué"
+msgstr "Test de connexion échoué"
#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
@@ -117,7 +117,7 @@ msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans
#: templates/settings.php:40
msgid "Base DN"
-msgstr "DN Racine"
+msgstr "DN racine"
#: templates/settings.php:41
msgid "One Base DN per line"
@@ -144,7 +144,7 @@ msgstr "Mot de passe"
#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
+msgstr "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides."
#: templates/settings.php:51
msgid "User Login Filter"
@@ -324,7 +324,7 @@ msgstr "Quota par défaut"
#: templates/settings.php:94
msgid "in bytes"
-msgstr "en octets"
+msgstr "en bytes"
#: templates/settings.php:95
msgid "Email Field"
@@ -342,7 +342,7 @@ msgstr "Laisser vide "
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Nom d'utilisateur interne"
#: templates/settings.php:102
msgid ""
@@ -381,7 +381,7 @@ msgstr ""
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Attribut UUID :"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 40d9a6e9ce..74443dba87 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 06:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index c7b3fdd97c..627dadfcfa 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 09:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 5f9f69c526..917e0cfc51 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 84a80b69d5..3914db5ce1 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-11 20:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index ce0a5d57d5..a4c52f858f 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 11:30+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Non foi posÃbel limpar as asignacións."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,15 +60,15 @@ msgstr "Non é posÃbel engadir a configuración do servidor"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "limpadas as asignacións"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Correcto"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Erro"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -342,7 +343,7 @@ msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, esp
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Nome de usuario interno"
#: templates/settings.php:102
msgid ""
@@ -358,15 +359,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omÃtense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atributo do nome de usuario interno:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Ignorar a detección do UUID"
#: templates/settings.php:105
msgid ""
@@ -377,15 +378,15 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atributo do UUID:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Asignación do usuario ao «nome de usuario LDAP»"
#: templates/settings.php:108
msgid ""
@@ -400,15 +401,15 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para asà reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensÃbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index e37d0c016b..d605f6893b 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 09:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 1082f58adc..a9d272af9c 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index c5e7737bb8..7c32f2b83b 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index ce9cabd5bc..fa36b2f31e 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "שמירה…"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "ביטול"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "קבוצות"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "×ž× ×”×œ הקבוצה"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "מחיקה"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "פחות"
msgid "Version"
msgstr "גרס×"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index de33f13ec1..86da072797 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "שגי××”"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 5ad69e813e..73cc62216f 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 834f399695..8e5d034383 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 991690ed18..a0d1710ecd 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 6bc1187371..958c0ac531 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Spremanje..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "izbrisano"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "vrati"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupa Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Obriši"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 127083fe20..166e8e4738 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Greška"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1ce61dc98c..3d1f00c6a4 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index e619f8ec6f..bbdedfe71e 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index a9a5961b17..2b1cf55a60 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index d341340b80..4bc6f8ef6f 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 16:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "FrissÃtve"
msgid "Saving..."
msgstr "Mentés..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "törölve"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "visszavonás"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolÃtáni"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Törlés"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "csoport hozzáadása"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Érvényes felhasználónevet kell megadnia"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "A felhasználó nem hozható létre"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index ff151467be..537f774ff5 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Hiba"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 1b1eef6e69..8e5b97b1c5 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:58+0200\n"
-"PO-Revision-Date: 2013-05-03 13:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 94c9b971fa..861f74f821 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 19c5329f29..262c7e82f7 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-05-04 01:58+0200\n"
-"PO-Revision-Date: 2013-05-03 13:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 76a8123d80..9297795c3b 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:59+0200\n"
-"PO-Revision-Date: 2013-05-03 13:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:36 personal.php:37
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr "Interlingua"
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index ba65dd7eac..2cccdd93f8 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Error"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 99b5e5b934..e17e73ed17 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 12d75c1e30..9d29950e69 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index d701cfac2e..eb5ff111db 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d462146a70..e490ada997 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Diperbarui"
msgid "Saving..."
msgstr "Menyimpan..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "dihapus"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "urungkan"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grup"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Hapus"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "tambah grup"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Tuliskan nama pengguna yang valid"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Gagal membuat pengguna"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
@@ -328,7 +328,7 @@ msgstr "Ciutkan"
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 560387e305..339de48ade 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Sukses"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Galat"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0fcf1d0e31..53ede14ddb 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 62c5f2deed..c568952bc0 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 180cfb3bd3..ceeac18a09 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 6bc82b2944..0906807b3c 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Er að vista ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "afturkalla"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Eyða"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Minna"
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 52c13fc9bf..ee1bb681f8 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Villa"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index ce6ac93cb7..152848c3bf 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 07:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 2b0e33df57..71fdca5443 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 07:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 31244b0df3..aac7e9ce16 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index ecfe7df22a..b7c03047e9 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 37733cea55..fd7aa26d11 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Cancellazione delle associazioni non riuscita."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,15 +60,15 @@ msgstr "Impossibile aggiungere la configurazione del server"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "associazioni cancellate"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Riuscito"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Errore"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -342,7 +343,7 @@ msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Nome utente interno"
#: templates/settings.php:102
msgid ""
@@ -358,11 +359,11 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Attributo nome utente interno:"
#: templates/settings.php:104
msgid "Override UUID detection"
@@ -381,11 +382,11 @@ msgstr ""
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Attributo UUID:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Associazione Nome utente-Utente LDAP"
#: templates/settings.php:108
msgid ""
@@ -404,11 +405,11 @@ msgstr ""
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Cancella associazione Nome utente-Utente LDAP"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index e0a0299d06..f36a992b11 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-07 07:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index bf5947b443..32f0f5daf3 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 12:00+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -217,7 +218,7 @@ msgstr "{count} ファイル"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "無効ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ownCloudã§äºˆç´„済ã¿ã§ã™"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index e3d441e887..bdec5a3450 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 3902b760a0..5c7b4905c9 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 04:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "更新済ã¿"
msgid "Saving..."
msgstr "ä¿å˜ä¸..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "削除"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "å…ƒã«æˆ»ã™"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "ユーザを削除出æ¥ã¾ã›ã‚“"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "グループ"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "グループ管ç†è€…"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "削除"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ã‚’è¿½åŠ "
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "有効ãªãƒ¦ãƒ¼ã‚¶åを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "ユーザ作æˆã‚¨ãƒ©ãƒ¼"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index d3bf595a9b..ebb735eb25 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 12:20+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -20,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "マッピングã®ã‚¯ãƒªã‚¢ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -60,15 +60,15 @@ msgstr "サーãƒè¨å®šã‚’è¿½åŠ ã§ãã¾ã›ã‚“"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "マッピングをクリアã—ã¾ã—ãŸ"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "æˆåŠŸ"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "エラー"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -343,7 +343,7 @@ msgstr "ユーザåを空ã®ã¾ã¾ã«ã—ã¦ãã ã•ã„（デフォルト）。
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "内部ユーザå"
#: templates/settings.php:102
msgid ""
@@ -359,15 +359,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "デフォルトã§ã¯ã€å†…部ユーザåã¯UUID属性ã‹ã‚‰ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶åãŒãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚Šã€ã‹ã¤æ–‡å—ã®å¤‰æ›ãŒå¿…è¦ãªã„ã“ã¨ã‚’ä¿è¨¼ã—ã¾ã™ã€‚内部ユーザåã«ã¯ã€[ a-zA-Z0-9_.@- ] ã®æ–‡å—ã®ã¿ãŒæœ‰åŠ¹ã§ã‚ã‚‹ã¨ã„ã†åˆ¶é™ãŒã‚ã‚Šã€ãã®ä»–ã®æ–‡å—ã¯å¯¾å¿œã™ã‚‹ ASCII コードã«å¤‰æ›ã•ã‚Œã‚‹ã‹å˜ã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ãã®ãŸã‚ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶åã¨ã®è¡çªã®å›žæ•°ãŒå¢—åŠ ã™ã‚‹ã§ã—ょã†ã€‚内部ユーザåã¯ã€å†…部的ã«ãƒ¦ãƒ¼ã‚¶ã‚’è˜åˆ¥ã™ã‚‹ãŸã‚ã«ç”¨ã„られã€ã¾ãŸã€ownCloudã«ãŠã‘るデフォルトã®ãƒ›ãƒ¼ãƒ フォルダåã¨ã—ã¦ã‚‚用ã„られã¾ã™ã€‚例ãˆã°*DAVサービスã®ã‚ˆã†ã«ã€ãƒªãƒ¢ãƒ¼ãƒˆURLã®ãƒãƒ¼ãƒˆã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ã“ã®è¨å®šã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã‚’å†å®šç¾©ã—ã¾ã™ã€‚ownCloud 5 以å‰ã¨åŒã˜ã‚ˆã†ãªæŒ¯ã‚‹èˆžã„ã«ã™ã‚‹ãŸã‚ã«ã¯ã€ä»¥ä¸‹ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®å±žæ€§ã‚’入力ã—ã¾ã™ã€‚空ã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚変更ã¯æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPユーザã«ãŠã„ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚"
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "内部ユーザå属性:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "UUID検出をå†å®šç¾©ã™ã‚‹"
#: templates/settings.php:105
msgid ""
@@ -378,15 +378,15 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "デフォルトã§ã¯ã€ownCloud 㯠UUID 属性を自動的ã«æ¤œå‡ºã—ã¾ã™ã€‚UUID属性ã¯ã€LDAPユーザã¨LDAPグループを間é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“れを指定ã—ãªã„å ´åˆã¯ã€å†…部ユーザåã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’用ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。空ã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚変更ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPユーザã¨LDAPグループã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚"
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID属性:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "ユーザåã¨LDAPユーザã®ãƒžãƒƒãƒ”ング"
#: templates/settings.php:108
msgid ""
@@ -405,11 +405,11 @@ msgstr ""
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "ユーザåã¨LDAPユーザã®ãƒžãƒƒãƒ”ングをクリアã™ã‚‹"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "グループåã¨LDAPグループã®ãƒžãƒƒãƒ”ングをクリアã™ã‚‹"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 7051022af7..e0df88abc2 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 4977e0d493..11183252ce 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 592898b1ea..41bba41dbd 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 734eede528..b7c222205a 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ"
msgid "Saving..."
msgstr "შენáƒáƒ®áƒ•áƒ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "დáƒáƒ‘რუნებáƒ"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "ჯგუფები"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "ჯგუფის áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "ჯგუფის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "შეცდáƒáƒ›áƒ მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის შექმნისáƒáƒ¡"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული პáƒáƒ áƒáƒšáƒ˜"
@@ -329,7 +329,7 @@ msgstr "უფრრნáƒáƒ™áƒšáƒ”ბი"
msgid "Version"
msgstr "ვერსიáƒ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index f083401586..b59faa4d49 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "დáƒáƒ¡áƒ ულდáƒ"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "შეცდáƒáƒ›áƒ"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 2e8b6e43eb..cdaa87d744 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 6ca79779ec..7db090797c 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index c4e8c0dec4..fbea475af8 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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-08 15:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 15aeff0cf9..a914eb0524 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-09 00:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index de1ccbfd4a..9f36e614e1 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "오류"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 4be0cb61d8..9a9a456888 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index faec0ff8ed..8a8df832c2 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index c875155aa9..f1b2bac0ba 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a59db52635..57cd5d6abc 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "پاشکه‌وتده‌کات..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 47af30023b..1a425c728d 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "سه‌رکه‌وتن"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "هه‌ڵه"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 297e614c2b..91e5887e0b 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index b1e060dc20..f6df3c8111 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 5533290894..69c55f0f89 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 8e088e758a..6575b570b9 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Speicheren..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "geläscht"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "réckgängeg man"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Gruppen Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Läschen"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 659bda9a14..38893be1d6 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index a6046c22ca..472e657708 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 12:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 4c54e269f6..c4731e2bd8 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 77bed8165a..38d8809bf8 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 164db54bc9..e8508048b4 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Saugoma..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "anuliuoti"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "GrupÄ—s"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "IÅ¡trinti"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Mažiau"
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 8df6aa7279..83ba46a5fd 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Klaida"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index ed8d247b10..f06cd6259b 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 5077cd2917..40ca8300d6 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 46290b2436..a777ecbef2 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 2fd80f4858..0b232f50be 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "AtjauninÄta"
msgid "Saving..."
msgstr "SaglabÄ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "izdzests"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "atsaukt"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotÄju"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Dzēst"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "pievienot grupu"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "JÄnorÄda derÄ«gs lietotÄjvÄrds"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Kļūda, veidojot lietotÄju"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "JÄnorÄda derÄ«ga parole"
@@ -328,7 +328,7 @@ msgstr "MazÄk"
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 4eb1ccaa67..cb1532a790 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Kļūda"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index cca6e22f55..cffc24c7a7 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 15433ffccd..299b8fd800 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 53216a98de..f0e618ecba 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 7e664ae61d..945c5571df 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Снимам..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "врати"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "ÐдминиÑтратор на група"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Избриши"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Помалку"
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index e41cfb4117..9a3f735d5e 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Грешка"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 4559ef41db..366bfde66d 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index df4e1fb780..f213c62924 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 8eaef7bab2..b54157fab2 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index b86d2eb41b..5f4003d2e8 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Simpan..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "dihapus"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Kumpulan"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Padam"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 530eb8780c..784790e0e9 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Ralat"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index fb7fcade40..e229487e28 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index ea77c752b3..948b6d50f4 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 1e5a285a90..2624ba4719 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index a00278adbd..6095b96de5 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Lagrer..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "slettet"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "angre"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Slett"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Mindre"
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 90dc3040a4..f6e688d102 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Suksess"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Feil"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 2a620401ee..d35357a3ad 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 19:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index d50df3b23f..c394fb203c 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 944f801c1a..ba389cde31 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 577422c469..24737684e0 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Bijgewerkt"
msgid "Saving..."
msgstr "Opslaan"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "verwijderd"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "ongedaan maken"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Verwijder"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "toevoegen groep"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Fout bij aanmaken gebruiker"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 3015b805fd..af11411cb6 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\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"
@@ -19,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Niet gelukt de vertalingen leeg te maken."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,15 +60,15 @@ msgstr "Kon de serverconfiguratie niet toevoegen"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "vertaaltabel leeggemaakt"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Succes"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fout"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -342,7 +343,7 @@ msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/A
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Interne gebruikersnaam"
#: templates/settings.php:102
msgid ""
@@ -362,11 +363,11 @@ msgstr ""
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Interne gebruikersnaam attribuut:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Negeren UUID detectie"
#: templates/settings.php:105
msgid ""
@@ -381,11 +382,11 @@ msgstr ""
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID Attribuut:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
#: templates/settings.php:108
msgid ""
@@ -404,11 +405,11 @@ msgstr ""
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index e4d45cd682..08adadd957 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-16 09:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index c5a3a400a6..178e9b6e3d 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 09:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 14a63b1462..85b5e8f5e9 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-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 14:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 8392d63c38..7661744100 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-16 09:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 97d542ba33..aa60a28904 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Feil"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 7e55cfc676..fb3ea7ee10 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 3ce89e5ae3..6add33eaeb 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 70bce2472e..68e83d04f5 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 69c7ff6ab7..cf78308378 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Enregistra..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "escafat"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "defar"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grops"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grop Admin"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Escafa"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index c863a67f1f..32a16d4e26 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Error"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 9ca6778fd0..e023ed3428 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 09:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 22ee017964..bd2888a2b8 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 09:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 48d0debe7f..0b1495b8d0 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 4c6e0f42df..569af9fbc9 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 09:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 8966061fb9..1cd3ec895b 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Sukces"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "BÅ‚Ä…d"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 21467c1e4d..e92342be50 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 00:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 158e6f0286..5d86a5195a 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 8336eefd7e..c9a34e6093 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9bd9a0bb7f..c5cf67cadd 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 11:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Atualizado"
msgid "Saving..."
msgstr "Salvando..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "excluÃdo"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "desfazer"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "ImpossÃvel remover usuário"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Excluir"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "adicionar grupo"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Forneça um nome de usuário válido"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Erro ao criar usuário"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index e841f4f0a0..eb862c273a 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Falha ao limpar os mapeamentos."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,15 +60,15 @@ msgstr "ImpossÃvel adicionar a configuração do servidor"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "mapeamentos limpos"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Sucesso"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Erro"
#: js/settings.js:141
msgid "Connection test succeeded"
@@ -342,7 +343,7 @@ msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifiqu
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Nome de usuário interno"
#: templates/settings.php:102
msgid ""
@@ -358,15 +359,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituÃdas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. "
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atributo Interno de Nome de Usuário:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Substituir detecção UUID"
#: templates/settings.php:105
msgid ""
@@ -377,15 +378,15 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP."
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atributo UUID:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Usuário-LDAP Mapeamento de Usuário"
#: templates/settings.php:108
msgid ""
@@ -400,15 +401,15 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensÃveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 29ffcb6e7d..3e8b32a2e5 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 16:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index dd8b0a5886..45addc54d2 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index bc0ceb89d5..2b2ad1fa7b 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index fada0ab8d7..8ac1ac314a 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 16:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index c544632981..35d7b778aa 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Sucesso"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Erro"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index a5db03c655..cb0f3da3c4 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index c9651266b3..4d7f89ed97 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0691654cd6..c4888b41a0 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-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 28af7d896f..b3c9bd49af 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "Se salvează..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "șters"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "Anulează ultima acțiune"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Șterge"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 2f84b02286..46778737fa 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Succes"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Eroare"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 22276bcd58..fbe806ab0e 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 19:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: foool <andrglad@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 05c4571990..99301a6874 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 28de0c794c..42f971ee76 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 29b575a006..7b98bf3705 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Обновлено"
msgid "Saving..."
msgstr "Сохранение..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "удален"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "отмена"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Ðевозможно удалить пользователÑ"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Группы"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Группа ÐдминиÑтраторы"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Удалить"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "добавить группу"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "ПредоÑтавте подходÑщее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "ПредоÑтавте подходÑщий пароль"
@@ -329,7 +329,7 @@ msgstr "Меньше"
msgid "Version"
msgstr "ВерÑиÑ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 7afc858efe..4b20940944 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "УÑпешно"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index bfbe3274c4..a63e62e68a 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr ""
#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
#: js/share.js:589
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 32e4d26536..9803ad4bf8 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,18 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
-# skoptev <skoptev@ukr.net>, 2012
-# Langaru <langaru@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 01:55+0200\n"
-"PO-Revision-Date: 2013-04-25 23:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,256 +20,260 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "ÐеполучаетÑÑ Ð¿ÐµÑ€ÐµÐ½ÐµÑти %s - Файл Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем уже ÑущеÑтвует"
+msgstr ""
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-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"
-msgstr "Файл не был загружен. ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
+msgstr ""
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr "Ошибка отÑутÑтвует, файл загружен уÑпешно."
+msgstr ""
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в 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 "Размер загруженного"
+msgstr ""
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr "Загружаемый файл был загружен чаÑтично"
+msgstr ""
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr "Файл не был загружен"
+msgstr ""
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr "ОтÑутÑтвует Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°"
+msgstr ""
#: ajax/upload.php:33
msgid "Failed to write to disk"
-msgstr "Ðе удалоÑÑŒ запиÑать на диÑк"
+msgstr ""
#: ajax/upload.php:51
msgid "Not enough storage available"
-msgstr "ÐедоÑтаточно меÑта в хранилище"
+msgstr ""
#: ajax/upload.php:83
msgid "Invalid directory."
-msgstr "Ðеверный каталог."
+msgstr ""
#: appinfo/app.php:12
msgid "Files"
-msgstr "Файлы"
+msgstr ""
#: js/fileactions.js:116
msgid "Share"
-msgstr "Сделать общим"
+msgstr ""
#: js/fileactions.js:126
msgid "Delete permanently"
-msgstr "Удалить навÑегда"
+msgstr ""
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
msgid "Delete"
-msgstr "Удалить"
+msgstr ""
#: js/fileactions.js:194
msgid "Rename"
-msgstr "Переименовать"
+msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
msgid "Pending"
-msgstr "Ожидающий решениÑ"
+msgstr ""
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "{new_name} already exists"
-msgstr "{новое_имÑ} уже ÑущеÑтвует"
+msgstr ""
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "replace"
-msgstr "отмена"
+msgstr ""
-#: js/filelist.js:252
+#: js/filelist.js:259
msgid "suggest name"
-msgstr "подобрать название"
+msgstr ""
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
msgid "cancel"
-msgstr "отменить"
+msgstr ""
-#: js/filelist.js:299
+#: js/filelist.js:306
msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {новое_имÑ} Ñ {Ñтарое_имÑ}"
+msgstr ""
-#: js/filelist.js:299
+#: js/filelist.js:306
msgid "undo"
-msgstr "отменить дейÑтвие"
+msgstr ""
-#: js/filelist.js:324
+#: js/filelist.js:331
msgid "perform delete operation"
-msgstr "выполнÑетÑÑ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
+msgstr ""
-#: js/filelist.js:406
+#: js/filelist.js:413
msgid "1 file uploading"
-msgstr "загрузка 1 файла"
+msgstr ""
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
msgid "files uploading"
msgstr ""
#: js/files.js:52
msgid "'.' is an invalid file name."
-msgstr "'.' ÑвлÑетÑÑ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼ именем файла."
+msgstr ""
#: js/files.js:56
msgid "File name cannot be empty."
-msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым."
+msgstr ""
#: js/files.js:64
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "Ðекорректное имÑ, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допуÑтимы."
+msgstr ""
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ваше хранилище переполнено, фалы больше не могут быть обновлены или Ñинхронизированы!"
+msgstr ""
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
+msgstr ""
-#: js/files.js:226
+#: js/files.js:231
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr "Идёт подготовка к Ñкачке Вашего файла. Ðто может занÑÑ‚ÑŒ некоторое времÑ, еÑли фалы большие."
+msgstr ""
-#: js/files.js:259
+#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ðевозможно загрузить файл,\n так как он имеет нулевой размер или ÑвлÑетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹"
+msgstr ""
-#: js/files.js:272
+#: js/files.js:277
msgid "Not enough space available"
-msgstr "Ðе доÑтаточно Ñвободного меÑта"
+msgstr ""
-#: js/files.js:312
+#: js/files.js:317
msgid "Upload cancelled."
-msgstr "Загрузка отменена"
+msgstr ""
-#: js/files.js:408
+#: js/files.js:413
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ПроцеÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файла. ЕÑли покинуть Ñтраницу ÑейчаÑ, загрузка будет отменена."
+msgstr ""
-#: js/files.js:481
+#: js/files.js:486
msgid "URL cannot be empty."
-msgstr "URL не должен быть пуÑтым."
+msgstr ""
-#: js/files.js:486
+#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸. ИÑпользование Ð½Ð°Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ 'Опубликовано' зарезервировано Owncloud"
+msgstr ""
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
msgid "Error"
msgstr "Ошибка"
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
msgid "Name"
-msgstr "ИмÑ"
+msgstr ""
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
msgid "Size"
-msgstr "Размер"
+msgstr ""
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
msgid "Modified"
-msgstr "Изменен"
+msgstr ""
-#: js/files.js:893
+#: js/files.js:898
msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
-#: js/files.js:895
+#: js/files.js:900
msgid "{count} folders"
-msgstr "{количеÑтво} папок"
+msgstr ""
-#: js/files.js:903
+#: js/files.js:908
msgid "1 file"
-msgstr "1 файл"
+msgstr ""
-#: js/files.js:905
+#: js/files.js:910
msgid "{count} files"
-msgstr "{количеÑтво} файлов"
+msgstr ""
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr "Загрузить "
+msgstr ""
#: templates/admin.php:5
msgid "File handling"
-msgstr "Работа Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸"
+msgstr ""
#: templates/admin.php:7
msgid "Maximum upload size"
-msgstr "МакÑимальный размер загружаемого файла"
+msgstr ""
#: templates/admin.php:10
msgid "max. possible: "
-msgstr "МакÑимально возможный"
+msgstr ""
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Ðеобходимо Ð´Ð»Ñ Ð¼Ð½Ð¾Ð¶ÐµÑтвенной загрузки."
+msgstr ""
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Включение ZIP-загрузки"
+msgstr ""
#: templates/admin.php:20
msgid "0 is unlimited"
-msgstr "0 без ограничений"
+msgstr ""
#: templates/admin.php:22
msgid "Maximum input size for ZIP files"
-msgstr "МакÑимальный размер входÑщих ZIP-файлов "
+msgstr ""
#: templates/admin.php:26
msgid "Save"
-msgstr "Сохранить"
+msgstr ""
#: templates/index.php:7
msgid "New"
-msgstr "Ðовый"
+msgstr ""
#: templates/index.php:10
msgid "Text file"
-msgstr "ТекÑтовый файл"
+msgstr ""
#: templates/index.php:12
msgid "Folder"
-msgstr "Папка"
+msgstr ""
#: templates/index.php:14
msgid "From link"
-msgstr "По ÑÑылке"
+msgstr ""
#: templates/index.php:42
msgid "Deleted files"
@@ -281,42 +281,42 @@ msgstr ""
#: templates/index.php:48
msgid "Cancel upload"
-msgstr "Отмена загрузки"
+msgstr ""
-#: templates/index.php:55
+#: templates/index.php:54
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:62
+#: templates/index.php:61
msgid "Nothing in here. Upload something!"
-msgstr "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!"
+msgstr ""
-#: templates/index.php:76
+#: templates/index.php:75
msgid "Download"
-msgstr "Загрузить"
+msgstr ""
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
msgid "Unshare"
-msgstr "Скрыть"
+msgstr ""
-#: templates/index.php:108
+#: templates/index.php:107
msgid "Upload too large"
-msgstr "Загрузка Ñлишком велика"
+msgstr ""
-#: templates/index.php:110
+#: templates/index.php:109
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Размер файлов, которые Ð’Ñ‹ пытаетеÑÑŒ загрузить, превышает макÑимально допуÑтимый размер Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ на данный Ñервер."
+msgstr ""
-#: templates/index.php:115
+#: templates/index.php:114
msgid "Files are being scanned, please wait."
-msgstr "Файлы ÑканируютÑÑ, пожалуйÑта, подождите."
+msgstr ""
-#: templates/index.php:118
+#: templates/index.php:117
msgid "Current scanning"
-msgstr "Текущее Ñканирование"
+msgstr ""
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "Обновление кÑша файловой ÑиÑтемы... "
+msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index dd27b348b3..4e65e5d446 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -3,15 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Дмитрий <langaru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,16 +20,16 @@ msgstr ""
#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr "%s не может быть удалён навÑегда"
+msgstr ""
#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
-msgstr "%s не может быть воÑÑтановлен"
+msgstr ""
#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
-msgstr "выполнить операцию воÑÑтановлениÑ"
+msgstr ""
#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
msgid "Error"
@@ -38,48 +37,48 @@ msgstr "Ошибка"
#: js/trash.js:34
msgid "delete file permanently"
-msgstr "удалить файл навÑегда"
+msgstr ""
#: js/trash.js:121
msgid "Delete permanently"
-msgstr "Удалить навÑегда"
+msgstr ""
#: js/trash.js:174 templates/index.php:17
msgid "Name"
-msgstr "ИмÑ"
+msgstr ""
#: js/trash.js:175 templates/index.php:27
msgid "Deleted"
-msgstr "Удалён"
+msgstr ""
#: js/trash.js:184
msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
#: js/trash.js:186
msgid "{count} folders"
-msgstr "{количеÑтво} папок"
+msgstr ""
#: js/trash.js:194
msgid "1 file"
-msgstr "1 файл"
+msgstr ""
#: js/trash.js:196
msgid "{count} files"
-msgstr "{количеÑтво} файлов"
+msgstr ""
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr "ЗдеÑÑŒ ничего нет. Ваша корзина пуÑта!"
+msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr "ВоÑÑтановить"
+msgstr ""
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
-msgstr "Удалить"
+msgstr ""
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr "Удаленные файлы"
+msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index bea5230516..5fc2851ce6 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: 2013-04-26 08:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,7 +106,7 @@ msgstr ""
#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/apps.js:90
msgid "Updating...."
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "удалено"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 3ee3d47145..5d247f8926 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,22 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2013.
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"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/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -41,7 +43,7 @@ msgstr ""
#: js/settings.js:66
msgid "Deletion failed"
-msgstr "Удаление не удалоÑÑŒ"
+msgstr ""
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
@@ -55,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "УÑпех"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr "<b>Предупреждение:</b> ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap и user_webdavauth неÑовмеÑтимы. Ð’Ñ‹ можете ÑтолкнутьÑÑ Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¼ поведением ÑиÑтемы. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из них."
+msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> Модуль PHP LDAP не уÑтановлен, бÑкÑнд не будет работать. ПожалуйÑта, обратитеÑÑŒ к Вашему ÑиÑтемному админиÑтратору, чтобы уÑтановить его."
+msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
-msgstr "ХоÑÑ‚"
+msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Ð’Ñ‹ можете пропуÑтить протокол, еÑли Вам не требуетÑÑ SSL. Затем начните Ñ ldaps://"
+msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
-msgstr "База DN"
+msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
-msgstr "Одно базовое DN на линию"
+msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Ð’Ñ‹ можете задать Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп во вкладке «Дополнительно»"
+msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
-msgstr "DN пользователÑ"
+msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr "DN клиентÑкого пользователÑ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ должна оÑущеÑтвлÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸Ð²Ñзка, например, uid=agent,dc=example,dc=com. Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ доÑтупа оÑтавьте Ð¿Ð¾Ð»Ñ DN и Пароль пуÑтыми."
+msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
-msgstr "Пароль"
+msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ доÑтупа оÑтавьте Ð¿Ð¾Ð»Ñ DN и пароль пуÑтыми."
+msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
-msgstr "Фильтр имен пользователей"
+msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr "Задает фильтр, применÑемый при загрузке пользователÑ. %%uid заменÑет Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ входе."
+msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "иÑпользуйте %%uid заполнитель, например, \"uid=%%uid\""
+msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
-msgstr "Фильтр ÑпиÑка пользователей"
+msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
-msgstr "Задает фильтр, применÑемый при получении пользователей."
+msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
+msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
-msgstr "Групповой фильтр"
+msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Задает фильтр, применÑемый при получении групп."
+msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
+msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
-msgstr "Порт"
+msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
-msgstr "ИÑпользовать TLS"
+msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
-msgstr "ÐечувÑтвительный к региÑтру LDAP-Ñервер (Windows)"
+msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
-msgstr "Выключить проверку Ñертификата SSL."
+msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr "ЕÑли Ñоединение работает только Ñ Ñтой опцией, импортируйте SSL-Ñертификат LDAP Ñервера в ваш ownCloud Ñервер."
+msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
-msgstr "Ðе рекомендовано, иÑпользуйте только Ð´Ð»Ñ Ñ‚ÐµÑтированиÑ."
+msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
-msgstr "в Ñекундах. Изменение очищает кÑш."
+msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
-msgstr "Поле, отображаемое как Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Ðтрибут LDAP, иÑпользуемый Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ownCloud."
+msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
-msgstr "Базовое дерево пользователей"
+msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
-msgstr "Одно пользовательÑкое базовое DN на линию"
+msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
-msgstr "Поле, отображаемое как Ð¸Ð¼Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Ðтрибут LDAP, иÑпользуемый Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ð³Ð¾ имени в ownCloud."
+msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
-msgstr "Базовое дерево групп"
+msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
-msgstr "Одно групповое базовое DN на линию"
+msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
-msgstr "СвÑзь член-группа"
+msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
-msgstr "в байтах"
+msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr "ОÑтавьте пуÑтым под Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (по умолчанию). Ð’ противном Ñлучае задайте LDAP/AD атрибут."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
-msgstr "Помощь"
+msgstr ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 56ebb8d405..21ffdc00b2 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 5b8f542999..ba42d31041 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 8ba334fb5a..872a72761b 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 4f85fab02b..dcbbfc411a 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "සුරà·à¶šà·™à¶¸à·’න් පවà¶à·“..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "නිෂ්ප්â€à¶»à¶· කරන්න"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "කණ්ඩà·à¶ºà¶¸à·Š"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "කà·à¶«à·Šà¶© පරිපà·à¶½à¶š"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "මක෠දමන්න"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "අඩු"
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index a5be1936d7..76caf1c770 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "දà·à·‚යක්"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index ed5350ae61..0d1e882f63 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 05:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 14299ed391..0905075025 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e46d3c3aa5..2ae6687e69 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index adbef6c0f0..a440dde639 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 18:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Aktualizované"
msgid "Saving..."
msgstr "Ukladám..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "zmazané"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "vrátiť"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Nemožno odobraÅ¥ použÃvateľa"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Zmazať"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "pridať skupinu"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "MusÃte zadaÅ¥ platné použÃvateľské meno"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Chyba pri vytváranà použÃvateľa"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "MusÃte zadaÅ¥ platné heslo"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index c5d0a3787b..740f7040fb 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Úspešné"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Chyba"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 47f370c3b5..c16d289f19 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:58+0200\n"
-"PO-Revision-Date: 2013-05-03 19:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index dd91fd8974..76edc3fd31 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 8900ee66e4..2ce8f9f03e 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 65640901d2..b4b74e10e0 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Posodobljeno"
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "izbrisano"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "razveljavi"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoÄe odstraniti"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Izbriši"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "dodaj skupino"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Navedeno mora biti veljavno uporabniško ime"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Napaka ustvarjanja uporabnika"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index eb88eab348..b3d02a1760 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "UspeÅ¡no konÄano."
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Napaka"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 71dbe13828..758cd937b6 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index f6b060849e..56ec4bbaf9 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index afda019715..630e921b32 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 7ad44cb2f8..4c1226537b 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 22:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "anulo"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Elimino"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 299948e7c4..839c6616a8 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Veprim i gabuar"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index c71d786985..6866ad5df6 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 1a261d747e..008e27f634 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index a412f3ccd3..0c35b37936 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 405497d2c3..372c87d23e 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Ðжурирано"
msgid "Saving..."
msgstr "Чување у току..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "обриÑано"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "опозови"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Ðе могу да уклоним кориÑника"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Групе"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Обриши"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "додај групу"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Морате унети иÑправно кориÑничко име"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Грешка при прављењу кориÑника"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Морате унети иÑправну лозинку"
@@ -328,7 +328,7 @@ msgstr "Мање"
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 7ce4478ba2..d13753c822 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Грешка"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 800698a5ad..bd03e0f487 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 0baab452a7..f99535735a 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 45c3d95fd3..33c448aa9e 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 6d8243e128..3be85181fe 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Uppdaterad"
msgid "Saving..."
msgstr "Sparar..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "raderad"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "Ã¥ngra"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Radera"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "lägg till grupp"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Ett giltigt användarnamn måste anges"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Fel vid skapande av användare"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
@@ -328,7 +328,7 @@ msgstr "Mindre"
msgid "Version"
msgstr "Version"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 1ad17b0412..9fca84c657 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Lyckat"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fel"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 40d5b280c9..07325fade9 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index dbcd1813fd..9ad71c544c 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index b6113a6d1d..79d45d3828 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6fff478e03..96dcf4f465 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr "சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "à®®à¯à®©à¯ செயல௠நீகà¯à®•à®®à¯ "
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "கà¯à®´à¯ நிரà¯à®µà®¾à®•à®¿"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "நீகà¯à®•à¯à®•"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "கà¯à®±à¯ˆà®µà®¾à®©"
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 7a74191cc6..2a5d7bf540 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "வழà¯"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 5e3424a27a..a4aaf33a49 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files.po b/l10n/te/files.po
index d13a3ed022..2dbe5ff11e 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 373705a9ee..90a947f784 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index f270bb90f0..fb91ffa67f 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "తొలగించà±"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index b417aa098f..eebc4da9ed 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "పొరపాటà±"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 7092183e74..61e6f94479 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-05-17 02:03+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ae93cc2d70..ac3eb255d6 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-05-17 02:02+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b186f4e3ed..bf19c1571e 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-05-17 02:02+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 25b7fff06e..003608f9c1 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-05-17 02:02+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index ab83c1a7ea..ff3c142710 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-05-17 02:02+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 0ff5838f85..36f2069022 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-05-17 02:02+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0fb80731b0..95b60081aa 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-05-17 02:02+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0eedfd01c4..8cefcaf9c9 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-05-17 02:03+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 99f0d75936..a7af02d434 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-05-17 02:03+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index e8decb69c8..cfabdd9f14 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-05-17 02:03+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index d0289509e2..510ed4c28a 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-05-17 02:03+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index daec53114a..568570f897 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index eda2b6d03d..52962e21fb 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 59f6d74901..0481d13799 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b25982bed3..0c88025491 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§"
msgid "Saving..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸à¸‚้à¸à¸¡à¸¹à¸¥..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "ลบà¹à¸¥à¹‰à¸§"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "เลิà¸à¸—ำ"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "à¸à¸¥à¸¸à¹ˆà¸¡"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "ผู้ดูà¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "ลบ"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "น้à¸à¸¢"
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index e2cf3668ac..ebb8a40aef 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "เสร็จสิ้น"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "ข้à¸à¸œà¸´à¸”พลาด"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 787d2a015e..6049fb79a2 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 5c0d5d7ad5..7a65c39831 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 7727f20a77..ff3ae0eaac 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index e14def81bc..2734559427 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 16:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Güncellendi"
msgid "Saving..."
msgstr "Kaydediliyor..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "silindi"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "geri al"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Sil"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "grup ekle"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Kullanıcı oluşturulurken hata"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index e7ee60833c..576140cd31 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Hata"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index a362760592..4642a6e1a2 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 10168dedbc..f69fcf0815 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index af6a62272c..d9d8571860 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 056a0697be..d7d4d921f9 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 12:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index a883642bab..96f22a9e8b 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "خاتالىق"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 8c37c90736..0d847d9392 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index c411fcf37c..617b66ad3e 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 37b8c49480..7c13dac4da 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 5a52fbc66e..dcbbcd3055 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Оновлено"
msgid "Saving..."
msgstr "Зберігаю..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "видалені"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "відмінити"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "Ðеможливо видалити кориÑтувача"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Групи"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "ÐдмініÑтратор групи"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Видалити"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "додати групу"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Потрібно задати вірне ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Помилка при Ñтворенні кориÑтувача"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
@@ -328,7 +328,7 @@ msgstr "Менше"
msgid "Version"
msgstr "ВерÑÑ–Ñ"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 984aca1e80..e57d6368ab 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "УÑпіх"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Помилка"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index dab44591bd..b16f5c533b 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index c9ff60d207..e34cfafff4 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 4191c25867..8844c8c59e 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index df2fa2592c..f659385b36 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 59f98edec4..61c99c1fcb 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "ایرر"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index e6723000ef..d5016bce85 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 17:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index b0d71c5e22..67d6e94d7f 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 5131f96d88..6e5de8cd4c 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index e491b49c01..22139400b8 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Äã cáºp nháºt"
msgid "Saving..."
msgstr "Äang lÆ°u..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "đã xóa"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "lùi lại"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Xóa"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Ãt"
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index b0451d74ca..c94715753c 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Thà nh công"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Lá»—i"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 3722c01c65..0915509f39 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 1b4d4b16f1..c6e9e821ef 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 487b06cc01..a6c759cdf0 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 06965bd612..bd917dd80d 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "å·²å‡çº§"
msgid "Saving..."
msgstr "ä¿å˜ä¸..."
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "åˆ é™¤"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "撤销"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "群组"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "群组管ç†å‘˜"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "åˆ é™¤"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "æ·»åŠ ç¾¤ç»„"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "请填写有效用户å"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "新增用户时出现错误"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "请填写有效密ç "
@@ -328,7 +328,7 @@ msgstr "æ›´å°‘"
msgid "Version"
msgstr "版本"
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index e1d62e209c..8eb298ee7e 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "æˆåŠŸ"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "出错"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index a9e6d7581f..59cf8218e1 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 02:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index e28f93b751..7bd8ad81e9 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:02+0200\n"
-"PO-Revision-Date: 2013-05-16 08:53+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 3d23aa4013..75da62afbf 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9044f64dc2..fef0cdd11b 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 02:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 2d4086d25e..47d10ead36 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "æˆåŠŸ"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "错误"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 524bd63e93..000af61d0f 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 675fe9c8b4..57d0ed08b7 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 257a2b7d6d..50a8313ffd 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 8f52891b9d..b9e2346a6f 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "群組"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "刪除"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 40fcbd80f3..f619852c77 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "æˆåŠŸ"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "錯誤"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 7d0aefbe77..e3de472e4e 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 04:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 92e7616365..81e77b9fbc 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index bc188ef03e..1a24751151 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 7b0dd5b766..dca33e8dbc 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 02:00+0200\n"
-"PO-Revision-Date: 2013-05-14 11:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 6b33c425aa..bfa71664a2 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -63,11 +63,11 @@ msgstr ""
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "æˆåŠŸ"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "錯誤"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 88aa2c905a..6f7db02781 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
+"Error" => "Ошибка",
"deleted" => "удалено"
);
--
GitLab
From f70240f4308d89183e00c9620b9703d30f905a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Sat, 18 May 2013 10:33:33 +0200
Subject: [PATCH 234/304] display a warning if the user has enabled file
recovery but the admin tries to change the users password without a recovery
password
---
settings/ajax/changepassword.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 6b5bf9c66b..cb66c57c74 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -28,8 +28,13 @@ if(is_null($userstatus)) {
exit();
}
-$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
-if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') {
+ OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" )));
+}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
OC_JSON::success(array("data" => array( "username" => $username )));
@@ -37,4 +42,3 @@ if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
else{
OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
}
-error_log("bliub");
--
GitLab
From 6980f59b2fcb05cb1d888f03af60b440a58d47ab Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 18 May 2013 21:12:53 +0200
Subject: [PATCH 235/304] fixed typos
---
apps/files_encryption/appinfo/spec.txt | 2 +-
apps/files_encryption/hooks/hooks.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index 4a7b3fc6ad..ddd3983a9e 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -16,7 +16,7 @@ Encrypted files
- Sharekey are stored in /data/user/files_encryption/share-files
- File extensions:
- - Catfiles have keep the file extension of the original file, pre-encryption
+ - Catfiles have to keep the file extension of the original file, pre-encryption
- Keyfiles use .keyfile
- Sharekeys have .shareKey
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 72334559b8..087ba3d893 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -320,7 +320,7 @@ class Hooks {
$sharingEnabled = \OCP\Share::isEnabled();
- // if a folder was shared, get a list if all (sub-)folders
+ // if a folder was shared, get a list of all (sub-)folders
if ($params['itemType'] === 'folder') {
$allFiles = $util->getAllFiles($path);
} else {
--
GitLab
From 80f9c5bb6d7d453a4a5b81abf346e8e20d10a5af Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 18 May 2013 21:37:00 +0200
Subject: [PATCH 236/304] removed mockery from tests and changed class names
---
apps/files_encryption/tests/crypt.php | 14 +-
apps/files_encryption/tests/keymanager.php | 9 +-
apps/files_encryption/tests/util.php | 160 ++-------------------
3 files changed, 12 insertions(+), 171 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 2dd644e07b..18faaceb03 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,7 +7,6 @@
* See the COPYING-README file.
*/
-//require_once "PHPUnit/Framework/TestCase.php";
require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
@@ -20,18 +19,7 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-
-/**
- * @note It would be better to use Mockery here for mocking out the session
- * handling process, and isolate calls to session class and data from the unit
- * tests relating to them (stream etc.). However getting mockery to work and
- * overload classes whilst also using the OC autoloader is difficult due to
- * load order Pear errors.
- */
-
-class Test_Crypt extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
function setUp() {
// reset backend
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 3f6b936373..415f332094 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -5,8 +5,7 @@
* later.
* See the COPYING-README file.
*/
-
-//require_once "PHPUnit/Framework/TestCase.php";
+
require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
@@ -18,11 +17,7 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
-// This has to go here because otherwise session errors arise, and the private
-// encryption key needs to be saved in the session
-//\OC_User::login( 'admin', 'admin' );
-
-class Test_Keymanager extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
function setUp() {
// reset backend
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 2d637e2053..648ca2486d 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -6,7 +6,6 @@
* See the COPYING-README file.
*/
-//require_once "PHPUnit/Framework/TestCase.php";
require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
@@ -15,16 +14,9 @@ require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
require_once realpath( dirname(__FILE__).'/../lib/util.php' );
require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-// Load mockery files
-require_once 'Mockery/Loader.php';
-require_once 'Hamcrest/Hamcrest.php';
-$loader = new \Mockery\Loader;
-$loader->register();
-
-use \Mockery as m;
use OCA\Encryption;
-class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
function setUp() {
// reset backend
@@ -72,28 +64,20 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$params['password'] = $this->pass;
OCA\Encryption\Hooks::login($params);
- $mockView = m::mock('OC_FilesystemView');
- $this->util = new Encryption\Util( $mockView, $this->userId );
-
+ $this->util = new Encryption\Util( $this->view, $this->userId );
}
function tearDown(){
- m::close();
\OC_FileProxy::clearProxies();
}
/**
* @brief test that paths set during User construction are correct
- *
- *
- *
*/
function testKeyPaths() {
- $mockView = m::mock('OC_FilesystemView');
-
- $util = new Encryption\Util( $mockView, $this->userId );
+ $util = new Encryption\Util( $this->view, $this->userId );
$this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
$this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
@@ -104,87 +88,19 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test setup of encryption directories when they don't yet exist
+ * @brief test setup of encryption directories
*/
- function testSetupServerSideNotSetup() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(7)->andReturn( false );
- $mockView->shouldReceive( 'mkdir' )->times(6)->andReturn( true );
- $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-
- }
+ function testSetupServerSide() {
- /**
- * @brief test setup of encryption directories when they already exist
- */
- function testSetupServerSideIsSetup() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(8)->andReturn( true );
- $mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-
- }
-
- /**
- * @brief test checking whether account is ready for encryption, when it isn't ready
- */
- function testReadyNotReady() {
-
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(1)->andReturn( false );
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( false, $util->ready() );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
+ $this->assertEquals( true, $this->util->setupServerSide( $this->pass ) );
}
/**
- * @brief test checking whether account is ready for encryption, when it is ready
+ * @brief test checking whether account is ready for encryption,
*/
- function testReadyIsReady() {
+ function testUserIsReady() {
- $mockView = m::mock('OC_FilesystemView');
-
- $mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( true );
-
- $util = new Encryption\Util( $mockView, $this->userId );
-
- $this->assertEquals( true, $util->ready() );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
- }
-
- function testFindEncFiles() {
-
-// $this->view->chroot( "/data/{$this->userId}/files" );
-
- $util = new Encryption\Util( $this->view, $this->userId );
-
- $files = $util->findEncFiles( '/'.$this->userId.'/');
-
- //var_dump( $files );
-
- # TODO: Add more tests here to check that if any of the dirs are
- # then false will be returned. Use strict ordering?
-
+ $this->assertEquals( true, $this->util->ready() );
}
function testRecoveryEnabledForUser() {
@@ -230,62 +146,4 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
$this->assertEquals($file, $filename);
}
-
-// /**
-// * @brief test decryption using legacy blowfish method
-// * @depends testLegacyEncryptLong
-// */
-// function testLegacyKeyRecryptKeyfileDecrypt( $recrypted ) {
-//
-// $decrypted = Encryption\Crypt::keyDecryptKeyfile( $recrypted['data'], $recrypted['key'], $this->genPrivateKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypted );
-//
-// }
-
-// // Cannot use this test for now due to hidden dependencies in OC_FileCache
-// function testIsLegacyEncryptedContent() {
-//
-// $keyfileContent = OCA\Encryption\Crypt::symmetricEncryptFileContent( $this->legacyEncryptedData, 'hat' );
-//
-// $this->assertFalse( OCA\Encryption\Crypt::isLegacyEncryptedContent( $keyfileContent, '/files/admin/test.txt' ) );
-//
-// OC_FileCache::put( '/admin/files/legacy-encrypted-test.txt', $this->legacyEncryptedData );
-//
-// $this->assertTrue( OCA\Encryption\Crypt::isLegacyEncryptedContent( $this->legacyEncryptedData, '/files/admin/test.txt' ) );
-//
-// }
-
-// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// function testGetLegacyKey() {
-//
-// $c = new \OCA\Encryption\Util( $view, false );
-//
-// $bool = $c->getLegacyKey( 'admin' );
-//
-// $this->assertTrue( $bool );
-//
-// $this->assertTrue( $c->legacyKey );
-//
-// $this->assertTrue( is_int( $c->legacyKey ) );
-//
-// $this->assertTrue( strlen( $c->legacyKey ) == 20 );
-//
-// }
-
-// // Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// function testLegacyDecrypt() {
-//
-// $c = new OCA\Encryption\Util( $this->view, false );
-//
-// $bool = $c->getLegacyKey( 'admin' );
-//
-// $encrypted = $c->legacyEncrypt( $this->data, $c->legacyKey );
-//
-// $decrypted = $c->legacyDecrypt( $encrypted, $c->legacyKey );
-//
-// $this->assertEquals( $decrypted, $this->data );
-//
-// }
-
}
\ No newline at end of file
--
GitLab
From e0e89602a24c151cd27095f355812a200acbbb83 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 18 May 2013 22:00:35 +0200
Subject: [PATCH 237/304] fixed key-manager tests
---
apps/files_encryption/tests/keymanager.php | 23 ++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 415f332094..151f6813e0 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -88,20 +88,27 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$privateKey = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->pass);
- // Will this length vary? Perhaps we should use a range instead
- $this->assertGreaterThan( 27, strlen( $privateKey ) );
+ $res = openssl_pkey_get_private($privateKey);
- $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $privateKey, 0, 27 ) );
+ $this->assertTrue(is_resource($res));
+
+ $sslInfo = openssl_pkey_get_details($res);
+
+ $this->assertArrayHasKey('key', $sslInfo);
}
function testGetPublicKey() {
- $key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
-
- $this->assertGreaterThan( 26, strlen( $key ) );
-
- $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
+ $publiceKey = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
+
+ $res = openssl_pkey_get_public($publiceKey);
+
+ $this->assertTrue(is_resource($res));
+
+ $sslInfo = openssl_pkey_get_details($res);
+
+ $this->assertArrayHasKey('key', $sslInfo);
}
function testSetFileKey() {
--
GitLab
From 681252669a237a2383bcdc05892e368785103ad2 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 18 May 2013 22:10:00 +0200
Subject: [PATCH 238/304] changed migrationStatus to migration_status for pgsql
---
apps/files_encryption/appinfo/database.xml | 2 +-
apps/files_encryption/lib/util.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index 64c9ef65fa..1935a4df6a 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -28,7 +28,7 @@
<comments>Whether encryption key recovery is enabled</comments>
</field>
<field>
- <name>migrationStatus</name>
+ <name>migration_status</name>
<type>boolean</type>
<notnull>true</notnull>
<default>0</default>
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 9588db8d64..4e32cf6da1 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1033,7 +1033,7 @@ class Util {
$sql = 'UPDATE
*PREFIX*encryption
SET
- migrationStatus = ?
+ migration_status = ?
WHERE
uid = ?';
@@ -1062,7 +1062,7 @@ class Util {
public function getMigrationStatus() {
$sql = 'SELECT
- migrationStatus
+ migration_status
FROM
`*PREFIX*encryption`
WHERE
@@ -1078,7 +1078,7 @@ class Util {
while( $row = $result->fetchRow() ) {
- $migrationStatus[] = $row['migrationStatus'];
+ $migrationStatus[] = $row['migration_status'];
}
--
GitLab
From 227b122947dc92f3d9d3984c1fe00919dc473b8b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 18 May 2013 22:25:47 +0200
Subject: [PATCH 239/304] fixed again key-manager tests
---
apps/files_encryption/tests/keymanager.php | 34 +++++++++-------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 151f6813e0..48e370d3a5 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -163,29 +163,23 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
function testGetUserKeys() {
$keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
-
- $this->assertGreaterThan( 26, strlen( $keys['publicKey'] ) );
- $this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
+ $resPublic = openssl_pkey_get_public($keys['publicKey']);
- $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $keys['privateKey'], $this->pass);
+ $this->assertTrue(is_resource($resPublic));
- $this->assertGreaterThan( 27, strlen( $keys['privateKey'] ) );
+ $sslInfoPublic = openssl_pkey_get_details($resPublic);
- $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $privateKey, 0, 27 ) );
-
- }
-
- function testGetPublicKeys() {
-
- # TODO: write me
-
- }
-
- function testGetFileKey() {
-
-// Encryption\Keymanager::getFileKey( $this->view, $this->userId, $this->filePath );
-
+ $this->assertArrayHasKey('key', $sslInfoPublic);
+
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $keys['privateKey'], $this->pass);
+
+ $resPrivate = openssl_pkey_get_private($privateKey);
+
+ $this->assertTrue(is_resource($resPrivate));
+
+ $sslInfoPrivate = openssl_pkey_get_details($resPrivate);
+
+ $this->assertArrayHasKey('key', $sslInfoPrivate);
}
-
}
--
GitLab
From 2a038baee0de882877defb131b5a97821e10a0b9 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sat, 18 May 2013 22:33:31 +0200
Subject: [PATCH 240/304] updated authors info
---
apps/files_encryption/appinfo/info.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 39ea155488..9de2798dd7 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -4,7 +4,7 @@
<name>Encryption</name>
<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
<licence>AGPL</licence>
- <author>Sam Tuke</author>
+ <author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
<require>4</require>
<shipped>true</shipped>
<types>
--
GitLab
From 694f42dfd5c61b441836bc6c95436006db62a875 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 19 May 2013 02:01:55 +0200
Subject: [PATCH 241/304] [tx-robot] updated from transifex
---
apps/user_ldap/l10n/de_DE.php | 1 +
apps/user_ldap/l10n/fr.php | 10 ++++++++++
apps/user_ldap/l10n/it.php | 1 +
l10n/de_DE/user_ldap.po | 9 +++++----
l10n/fr/user_ldap.po | 27 ++++++++++++++-------------
l10n/it/user_ldap.po | 6 +++---
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
17 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index cfbc6a517c..de2dd118e5 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -72,6 +72,7 @@
"Email Field" => "E-Mail-Feld",
"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index d6a6b36d56..11f8fbaaf4 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
"Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
@@ -7,6 +8,7 @@
"Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
"Keep settings?" => "Garder ces paramètres ?",
"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
+"mappings cleared" => "associations supprimées",
"Success" => "Succès",
"Error" => "Erreur",
"Connection test succeeded" => "Test de connexion réussi",
@@ -73,7 +75,15 @@
"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
"Internal Username" => "Nom d'utilisateur interne",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+"Internal Username Attribute:" => "Nom d'utilisateur interne:",
+"Override UUID detection" => "Surcharger la détection d'UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
"UUID Attribute:" => "Attribut UUID :",
+"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation.",
+"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
"Test Configuration" => "Tester la configuration",
"Help" => "Aide"
);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 5a7e682ec9..4027cb8851 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -77,6 +77,7 @@
"Internal Username" => "Nome utente interno",
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
"Internal Username Attribute:" => "Attributo nome utente interno:",
+"Override UUID detection" => "Ignora rilevamento UUID",
"UUID Attribute:" => "Attributo UUID:",
"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index b9b4139d8c..c0780d51b8 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 22:00+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -343,7 +344,7 @@ msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tr
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Interner Benutzername"
#: templates/settings.php:102
msgid ""
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 066ed1f420..d277eef42e 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# plachance <patlachance@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 22:20+0000\n"
-"Last-Translator: RyDroid <rydroid_trans@yahoo.fr>\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 18:01+0000\n"
+"Last-Translator: plachance <patlachance@gmail.com>\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 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Erreur lors de la suppression des associations."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,7 +60,7 @@ msgstr "Impossible d'ajouter la configuration du serveur"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "associations supprimées"
#: js/settings.js:112
msgid "Success"
@@ -358,15 +359,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Nom d'utilisateur interne:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Surcharger la détection d'UUID"
#: templates/settings.php:105
msgid ""
@@ -377,7 +378,7 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
#: templates/settings.php:106
msgid "UUID Attribute:"
@@ -385,7 +386,7 @@ msgstr "Attribut UUID :"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
#: templates/settings.php:108
msgid ""
@@ -400,15 +401,15 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Supprimer l'association nom de groupe-groupe LDAP"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index fd7aa26d11..56a5866b21 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 06:20+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -367,7 +367,7 @@ msgstr "Attributo nome utente interno:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Ignora rilevamento UUID"
#: templates/settings.php:105
msgid ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 61e6f94479..c2f050d2cc 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ac3eb255d6..841c54afcb 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index bf19c1571e..6403f79b4c 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 003608f9c1..34004b3c71 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index ff3c142710..d1b8054bd9 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 36f2069022..25038ad33f 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 95b60081aa..6b4d1528f6 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 8cefcaf9c9..2cf50f6f59 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a7af02d434..ece0283549 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index cfabdd9f14..3f6f457e47 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 510ed4c28a..1ffa7770df 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-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
--
GitLab
From ddda2a1f795122518d13b8654ab4a738d6fa526f Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 19 May 2013 07:04:31 +0200
Subject: [PATCH 242/304] changed database column 'recovery' to
'recovery_enabled' because recovery is a pgsql keyword more info about pgsql
keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
---
apps/files_encryption/appinfo/database.xml | 2 +-
apps/files_encryption/lib/util.php | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index 1935a4df6a..ca149f0c69 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -21,7 +21,7 @@
<comments>What client-side / server-side configuration is used</comments>
</field>
<field>
- <name>recovery</name>
+ <name>recovery_enabled</name>
<type>boolean</type>
<notnull>true</notnull>
<default>0</default>
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4e32cf6da1..82f789c520 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -228,7 +228,7 @@ class Util {
if ( false === $this->recoveryEnabledForUser() ) {
// create database configuration
- $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery`) VALUES (?,?,?)';
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
$args = array( $this->userId, 'server-side', 0);
$query = \OCP\DB::prepare( $sql );
$query->execute( $args );
@@ -252,7 +252,7 @@ class Util {
public function recoveryEnabledForUser() {
$sql = 'SELECT
- recovery
+ recovery_enabled
FROM
`*PREFIX*encryption`
WHERE
@@ -268,7 +268,7 @@ class Util {
while( $row = $result->fetchRow() ) {
- $recoveryEnabled[] = $row['recovery'];
+ $recoveryEnabled[] = $row['recovery_enabled'];
}
@@ -299,7 +299,7 @@ class Util {
if ( false === $recoveryStatus ) {
$sql = 'INSERT INTO `*PREFIX*encryption`
- (`uid`,`mode`,`recovery`)
+ (`uid`,`mode`,`recovery_enabled`)
VALUES (?,?,?)';
$args = array( $this->userId, 'server-side', $enabled );
@@ -310,7 +310,7 @@ class Util {
$sql = 'UPDATE
*PREFIX*encryption
SET
- recovery = ?
+ recovery_enabled = ?
WHERE
uid = ?';
--
GitLab
From 7ec36c5bbb10ea67f2958cd867aa116ffce7ae19 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 19 May 2013 13:33:33 +0200
Subject: [PATCH 243/304] Add password to pre_login
I need this to intercept passwords for my WIP multi-factor
authentication app.
---
lib/user.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/user.php b/lib/user.php
index 226b716188..b607874afa 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -32,7 +32,7 @@
* post_deleteUser(uid)
* pre_setPassword(&run, uid, password)
* post_setPassword(uid, password)
- * pre_login(&run, uid)
+ * pre_login(&run, uid, password)
* post_login(uid)
* logout()
*/
@@ -244,7 +244,7 @@ class OC_User {
*/
public static function login( $uid, $password ) {
$run = true;
- OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
+ OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid, "password" => $password));
if( $run ) {
$uid = self::checkPassword( $uid, $password );
--
GitLab
From 41e2d64c86fffc3e507a1ad0788bcb498db2c640 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 19 May 2013 14:15:49 -0400
Subject: [PATCH 244/304] Add support for copying/moving folders between
storages, move isIgnoredDir() to Filesystem
---
lib/files/cache/scanner.php | 14 +-------------
lib/files/filesystem.php | 13 +++++++++++++
lib/files/view.php | 32 ++++++++++++++++++++++++--------
3 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 661bc48633..0b1947f17c 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -115,7 +115,7 @@ class Scanner {
\OC_DB::beginTransaction();
while ($file = readdir($dh)) {
$child = ($path) ? $path . '/' . $file : $file;
- if (!$this->isIgnoredDir($file)) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
if ($data) {
if ($data['size'] === -1) {
@@ -149,18 +149,6 @@ class Scanner {
return $size;
}
- /**
- * @brief check if the directory should be ignored when scanning
- * NOTE: the special directories . and .. would cause never ending recursion
- * @param String $dir
- * @return boolean
- */
- private function isIgnoredDir($dir) {
- if ($dir === '.' || $dir === '..') {
- return true;
- }
- return false;
- }
/**
* @brief check if the file should be ignored when scanning
* NOTE: files with a '.part' extension are ignored as well!
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d60d430d77..99d87011df 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -453,6 +453,19 @@ class Filesystem {
return (in_array($filename, $blacklist));
}
+ /**
+ * @brief check if the directory should be ignored when scanning
+ * NOTE: the special directories . and .. would cause never ending recursion
+ * @param String $dir
+ * @return boolean
+ */
+ static public function isIgnoredDir($dir) {
+ if ($dir === '.' || $dir === '..') {
+ return true;
+ }
+ return false;
+ }
+
/**
* following functions are equivalent to their php builtin equivalents for arguments/return values.
*/
diff --git a/lib/files/view.php b/lib/files/view.php
index f35e1e3dc1..875a6c1a1f 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -372,11 +372,18 @@ class View {
$result = false;
}
} else {
- $source = $this->fopen($path1 . $postFix1, 'r');
- $target = $this->fopen($path2 . $postFix2, 'w');
- list($count, $result) = \OC_Helper::streamCopy($source, $target);
- list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
- $storage1->unlink($internalPath1);
+ if ($this->is_dir($path1)) {
+ $result = $this->copy($path1, $path2);
+ if ($result === true) {
+ $result = $this->deleteAll($path1);
+ }
+ } else {
+ $source = $this->fopen($path1 . $postFix1, 'r');
+ $target = $this->fopen($path2 . $postFix2, 'w');
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+ $storage1->unlink($internalPath1);
+ }
}
if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
\OC_Hook::emit(
@@ -459,9 +466,18 @@ class View {
$result = false;
}
} else {
- $source = $this->fopen($path1 . $postFix1, 'r');
- $target = $this->fopen($path2 . $postFix2, 'w');
- list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
+ $this->mkdir($path2);
+ while ($file = readdir($dh)) {
+ if (!Filesystem::isIgnoredDir($file)) {
+ $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ }
+ }
+ } else {
+ $source = $this->fopen($path1 . $postFix1, 'r');
+ $target = $this->fopen($path2 . $postFix2, 'w');
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ }
}
if ($this->fakeRoot == Filesystem::getRoot()) {
\OC_Hook::emit(
--
GitLab
From e9b71eed691050e23d78910abdd8bf313f2f83cb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 19 May 2013 14:20:46 -0400
Subject: [PATCH 245/304] Add tests for copying/moving between storages
---
tests/lib/files/view.php | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index a064e44f3e..554bc7291a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -228,6 +228,40 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals(3, $cachedData['size']);
}
+ function testCopyBetweenStorages() {
+ $storage1 = $this->getTestStorage();
+ $storage2 = $this->getTestStorage();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ \OC\Files\Filesystem::mount($storage2, array(), '/substorage');
+
+ $rootView = new \OC\Files\View('');
+ $rootView->copy('substorage', 'anotherfolder');
+ $this->assertTrue($rootView->is_dir('/anotherfolder'));
+ $this->assertTrue($rootView->is_dir('/substorage'));
+ $this->assertTrue($rootView->file_exists('/anotherfolder/foo.txt'));
+ $this->assertTrue($rootView->file_exists('/anotherfolder/foo.png'));
+ $this->assertTrue($rootView->file_exists('/anotherfolder/folder/bar.txt'));
+ $this->assertTrue($rootView->file_exists('/substorage/foo.txt'));
+ $this->assertTrue($rootView->file_exists('/substorage/foo.png'));
+ $this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt'));
+ }
+
+ function testMoveBetweenStorages() {
+ $storage1 = $this->getTestStorage();
+ $storage2 = $this->getTestStorage();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ \OC\Files\Filesystem::mount($storage2, array(), '/substorage');
+
+ $rootView = new \OC\Files\View('');
+ $rootView->rename('foo.txt', 'substorage/folder/foo.txt');
+ $this->assertFalse($rootView->file_exists('foo.txt'));
+ $this->assertTrue($rootView->file_exists('substorage/folder/foo.txt'));
+ $rootView->rename('substorage/folder', 'anotherfolder');
+ $this->assertFalse($rootView->is_dir('substorage/folder'));
+ $this->assertTrue($rootView->file_exists('anotherfolder/foo.txt'));
+ $this->assertTrue($rootView->file_exists('anotherfolder/bar.txt'));
+ }
+
/**
* @param bool $scan
* @return \OC\Files\Storage\Storage
--
GitLab
From fc5bce1f76a3a67a4ac9095d15441e363dfd03d1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 19 May 2013 15:04:41 -0400
Subject: [PATCH 246/304] Fix undefined variable for copying empty folders
---
lib/files/view.php | 2 +-
tests/lib/files/view.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/files/view.php b/lib/files/view.php
index 875a6c1a1f..8a37a0bcc6 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -467,7 +467,7 @@ class View {
}
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
- $this->mkdir($path2);
+ $result = $this->mkdir($path2);
while ($file = readdir($dh)) {
if (!Filesystem::isIgnoredDir($file)) {
$result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 554bc7291a..a51d99e793 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -235,9 +235,12 @@ class View extends \PHPUnit_Framework_TestCase {
\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
$rootView = new \OC\Files\View('');
+ $rootView->mkdir('substorage/emptyfolder');
$rootView->copy('substorage', 'anotherfolder');
$this->assertTrue($rootView->is_dir('/anotherfolder'));
$this->assertTrue($rootView->is_dir('/substorage'));
+ $this->assertTrue($rootView->is_dir('/anotherfolder/emptyfolder'));
+ $this->assertTrue($rootView->is_dir('/substorage/emptyfolder'));
$this->assertTrue($rootView->file_exists('/anotherfolder/foo.txt'));
$this->assertTrue($rootView->file_exists('/anotherfolder/foo.png'));
$this->assertTrue($rootView->file_exists('/anotherfolder/folder/bar.txt'));
--
GitLab
From bdd2127f19db92d7f3eccfa0cee402add23529f6 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 19 May 2013 22:28:48 +0200
Subject: [PATCH 247/304] cleanup tests
---
apps/files_encryption/tests/crypt.php | 64 ++++++++++------------
apps/files_encryption/tests/keymanager.php | 14 ++++-
apps/files_encryption/tests/share.php | 42 ++++++++++++--
apps/files_encryption/tests/util.php | 22 +++++++-
4 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 18faaceb03..c669aec122 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -19,8 +19,25 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Crypt
+ */
class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
-
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ public $dataLong;
+ public $dataUrl;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $legacyEncryptedData;
+ public $genPrivateKey;
+ public $genPublicKey;
+
function setUp() {
// reset backend
\OC_User::clearBackends();
@@ -93,7 +110,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertTrue( strlen( $key ) > 16 );
}
-
+
+ /**
+ * @return String
+ */
function testGenerateIv() {
$iv = Encryption\Crypt::generateIv();
@@ -150,7 +170,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
}
-
+
+ /**
+ * @return string padded
+ */
function testAddPadding() {
$padded = Encryption\Crypt::addPadding( $this->dataLong );
@@ -214,34 +237,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataShort, $decrypt );
}
-
- // These aren't used for now
-// function testSymmetricBlockEncryptShortFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataShort, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataShort, $decrypt );
-//
-// }
-//
-// function testSymmetricBlockEncryptLongFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataLong, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypt );
-//
-// }
-
+
function testSymmetricStreamEncryptShortFileContent() {
$filename = 'tmp-'.time().'.test';
@@ -351,9 +347,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$decrypt = '';
// Manually decrypt chunk
- foreach ($e as $e) {
+ foreach ($e as $chunk) {
- $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $plainKeyfile );
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $chunk, $plainKeyfile );
// Assemble decrypted chunks
$decrypt .= $chunkDecrypt;
@@ -741,7 +737,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $decrypt );
// change password
- \OC_User::setPassword($this->userId, 'test');
+ \OC_User::setPassword($this->userId, 'test', null);
// relogin
$params['uid'] = $this->userId;
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 48e370d3a5..8ca8b0287e 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -17,8 +17,20 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Keymanager
+ */
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
-
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $randomKey;
+
function setUp() {
// reset backend
\OC_User::clearBackends();
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index a40a992b80..de02513dea 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -32,10 +32,24 @@ require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Share
+ */
class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
{
- function setUp()
+ public $stateFilesTrashbin;
+ public $filename;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ function setUp()
{
// reset backend
\OC_User::clearBackends();
@@ -106,7 +120,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
\OC_FileProxy::clearProxies();
}
- function testShareFile($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ */
+ function testShareFile($withTeardown = true)
{
// login as admin
$this->loginHelper('admin');
@@ -171,7 +188,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
}
}
- function testReShareFile($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFile($withTeardown = true)
{
$this->testShareFile(false);
@@ -228,7 +248,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
}
}
- function testShareFolder($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ * @return array
+ */
+ function testShareFolder($withTeardown = true)
{
// login as admin
$this->loginHelper('admin');
@@ -297,7 +321,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
return $fileInfo;
}
- function testReShareFolder($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFolder($withTeardown = true)
{
$fileInfoFolder1 = $this->testShareFolder(false);
@@ -664,6 +691,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertTrue($util->setRecoveryForUser(false));
}
+ /**
+ * @param $user
+ * @param bool $create
+ * @param bool $password
+ */
function loginHelper($user, $create = false, $password = false)
{
if ($create) {
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 648ca2486d..53ac8ee8d6 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -16,8 +16,28 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Util
+ */
class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
-
+
+ public $userId;
+ public $encryptionDir;
+ public $publicKeyDir;
+ public $pass;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $keyfilesPath;
+ public $publicKeyPath;
+ public $privateKeyPath;
+ /**
+ * @var \OCA\Encryption\Util
+ */
+ public $util;
+ public $dataShort;
+
function setUp() {
// reset backend
\OC_User::useBackend('database');
--
GitLab
From 079f918d5ca0d242e77717aaeac82bcf011dc745 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 19 May 2013 22:30:03 +0200
Subject: [PATCH 248/304] fix for webdav and wrong reference for
findByStorageId
---
lib/files/cache/backgroundwatcher.php | 2 +-
lib/files/filesystem.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index 7549745e7d..b5770d0582 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/files/cache/backgroundwatcher.php
@@ -30,7 +30,7 @@ class BackgroundWatcher {
return;
}
list($storageId, $internalPath) = $cacheItem;
- $mounts = Mount::findByStorageId($storageId);
+ $mounts = Mount\Manager::findByStorageId($storageId);
if (count($mounts) === 0) {
//if the storage we need isn't mounted on default, try to find a user that has access to the storage
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d60d430d77..d0cac9dc1d 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,7 +236,9 @@ class Filesystem {
}
static public function initMounts(){
- self::$mounts = new Mount\Manager();
+ if(!self::$mounts) {
+ self::$mounts = new Mount\Manager();
+ }
}
/**
--
GitLab
From 5d572c344925e4599741ada08b70e48c88fb9011 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 19 May 2013 22:31:00 +0200
Subject: [PATCH 249/304] update phpdoc
---
apps/files_encryption/lib/keymanager.php | 6 ++++--
apps/files_encryption/lib/session.php | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 74462a0d1e..b422ff099b 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -28,10 +28,12 @@ namespace OCA\Encryption;
* @note Where a method requires a view object, it's root must be '/'
*/
class Keymanager {
-
+
/**
* @brief retrieve the ENCRYPTED private key from a user
- *
+ *
+ * @param \OC_FilesystemView $view
+ * @param string $user
* @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index f02315f95d..8d604dc721 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -97,8 +97,8 @@ class Session {
/**
* @brief Sets user private key to session
+ * @param string $privateKey
* @return bool
- *
*/
public function setPrivateKey( $privateKey ) {
--
GitLab
From dc39ef378e0ffd76d8105ae14822c1e3cc0d01a1 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 00:38:23 +0200
Subject: [PATCH 250/304] changed recovery_enabled and migration_status columns
to integer and fix tests
---
apps/files_encryption/appinfo/database.xml | 4 ++--
apps/files_encryption/tests/share.php | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index ca149f0c69..4587930da0 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -22,14 +22,14 @@
</field>
<field>
<name>recovery_enabled</name>
- <type>boolean</type>
+ <type>integer</type>
<notnull>true</notnull>
<default>0</default>
<comments>Whether encryption key recovery is enabled</comments>
</field>
<field>
<name>migration_status</name>
- <type>boolean</type>
+ <type>integer</type>
<notnull>true</notnull>
<default>0</default>
<comments>Whether encryption migration has been performed</comments>
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index de02513dea..efff8e322e 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -452,7 +452,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
\OC_FileProxy::$enabled = $proxyStatus;
// share the file
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, false);
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
// login as admin
$this->loginHelper('admin');
@@ -572,7 +572,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertTrue($util->checkRecoveryPassword('test123'));
// enable recovery for admin
- $this->assertTrue($util->setRecoveryForUser(true));
+ $this->assertTrue($util->setRecoveryForUser(1));
// create folder structure
$this->view->mkdir('/admin/files' . $this->folder1);
@@ -594,7 +594,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
// disable recovery for admin
- $this->assertTrue($util->setRecoveryForUser(false));
+ $this->assertTrue($util->setRecoveryForUser(0));
// remove all recovery keys
$util->removeRecoveryKeys('/');
@@ -604,7 +604,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
// enable recovery for admin
- $this->assertTrue($util->setRecoveryForUser(true));
+ $this->assertTrue($util->setRecoveryForUser(1));
// remove all recovery keys
$util->addRecoveryKeys('/');
@@ -639,7 +639,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'user1');
// enable recovery for admin
- $this->assertTrue($util->setRecoveryForUser(true));
+ $this->assertTrue($util->setRecoveryForUser(1));
// create folder structure
$this->view->mkdir('/user1/files' . $this->folder1);
@@ -688,7 +688,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
// enable recovery for admin
- $this->assertTrue($util->setRecoveryForUser(false));
+ $this->assertTrue($util->setRecoveryForUser(0));
}
/**
--
GitLab
From b1d0e8f40b97974591c42b3779d949c745a23351 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 00:47:00 +0200
Subject: [PATCH 251/304] removed /l10n/.tx/ from .gitignore
---
.gitignore | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index bc0c1d53a5..fe89c74ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,5 +76,4 @@ nbproject
data-autotest
/tests/coverage*
/tests/autoconfig*
-/tests/autotest*
-/l10n/.tx/
\ No newline at end of file
+/tests/autotest*
\ No newline at end of file
--
GitLab
From 3b850a2524471030da27227cba18b31ffc998aa4 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 01:24:36 +0200
Subject: [PATCH 252/304] reformat code added and changed phpdoc
---
apps/files_encryption/lib/crypt.php | 827 +++++++------
apps/files_encryption/lib/helper.php | 134 +-
apps/files_encryption/lib/keymanager.php | 517 ++++----
apps/files_encryption/lib/proxy.php | 677 +++++-----
apps/files_encryption/lib/session.php | 167 +--
apps/files_encryption/lib/stream.php | 562 ++++-----
apps/files_encryption/lib/util.php | 1294 +++++++++++---------
apps/files_encryption/tests/crypt.php | 911 +++++++-------
apps/files_encryption/tests/keymanager.php | 147 +--
apps/files_encryption/tests/share.php | 640 +++++-----
apps/files_encryption/tests/util.php | 192 +--
11 files changed, 3154 insertions(+), 2914 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ba588819d0..783c19d254 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -4,8 +4,8 @@
* ownCloud
*
* @author Sam Tuke, Frank Karlitschek, Robin Appelman
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Robin Appelman icewind@owncloud.com, Frank Karlitschek
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com,
+ * Robin Appelman icewind@owncloud.com, Frank Karlitschek
* frank@owncloud.org
*
* This library is free software; you can redistribute it and/or
@@ -27,505 +27,532 @@ namespace OCA\Encryption;
require_once 'Crypt_Blowfish/Blowfish.php';
-// Todo:
-// - Add a setting "Don´t encrypt files larger than xx because of performance"
-// - Don't use a password directly as encryption key. but a key which is
-// stored on the server and encrypted with the user password. -> change pass
-// faster
-
/**
* Class for common cryptography functionality
*/
-class Crypt {
+class Crypt
+{
/**
* @brief return encryption mode client or server side encryption
- * @param string user name (use system wide setting if name=null)
+ * @param string $user name (use system wide setting if name=null)
* @return string 'client' or 'server'
*/
- public static function mode( $user = null ) {
+ public static function mode($user = null)
+ {
return 'server';
-
+
}
-
- /**
- * @brief Create a new encryption keypair
- * @return array publicKey, privatekey
- */
- public static function createKeypair() {
-
+
+ /**
+ * @brief Create a new encryption keypair
+ * @return array publicKey, privatekey
+ */
+ public static function createKeypair()
+ {
+
$res = openssl_pkey_new(array('private_key_bits' => 4096));
// Get private key
- openssl_pkey_export( $res, $privateKey );
+ openssl_pkey_export($res, $privateKey);
// Get public key
- $publicKey = openssl_pkey_get_details( $res );
-
+ $publicKey = openssl_pkey_get_details($res);
+
$publicKey = $publicKey['key'];
-
- return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
-
+
+ return (array('publicKey' => $publicKey, 'privateKey' => $privateKey));
+
}
-
- /**
- * @brief Add arbitrary padding to encrypted data
- * @param string $data data to be padded
- * @return padded data
- * @note In order to end up with data exactly 8192 bytes long we must
- * add two letters. It is impossible to achieve exactly 8192 length
- * blocks with encryption alone, hence padding is added to achieve the
- * required length.
- */
- public static function addPadding( $data ) {
-
+
+ /**
+ * @brief Add arbitrary padding to encrypted data
+ * @param string $data data to be padded
+ * @return string padded data
+ * @note In order to end up with data exactly 8192 bytes long we must
+ * add two letters. It is impossible to achieve exactly 8192 length
+ * blocks with encryption alone, hence padding is added to achieve the
+ * required length.
+ */
+ public static function addPadding($data)
+ {
+
$padded = $data . 'xx';
-
+
return $padded;
-
+
}
-
- /**
- * @brief Remove arbitrary padding to encrypted data
- * @param string $padded padded data to remove padding from
- * @return unpadded data on success, false on error
- */
- public static function removePadding( $padded ) {
-
- if ( substr( $padded, -2 ) == 'xx' ) {
-
- $data = substr( $padded, 0, -2 );
-
+
+ /**
+ * @brief Remove arbitrary padding to encrypted data
+ * @param string $padded padded data to remove padding from
+ * @return string unpadded data on success, false on error
+ */
+ public static function removePadding($padded)
+ {
+
+ if (substr($padded, -2) == 'xx') {
+
+ $data = substr($padded, 0, -2);
+
return $data;
-
+
} else {
-
+
// TODO: log the fact that unpadded data was submitted for removal of padding
return false;
-
+
}
-
+
}
-
- /**
- * @brief Check if a file's contents contains an IV and is symmetrically encrypted
- * @return true / false
- * @note see also OCA\Encryption\Util->isEncryptedPath()
- */
- public static function isCatfileContent( $content ) {
-
- if ( !$content ) {
-
+
+ /**
+ * @brief Check if a file's contents contains an IV and is symmetrically encrypted
+ * @param $content
+ * @return boolean
+ * @note see also OCA\Encryption\Util->isEncryptedPath()
+ */
+ public static function isCatfileContent($content)
+ {
+
+ if (!$content) {
+
return false;
-
+
}
-
- $noPadding = self::removePadding( $content );
-
+
+ $noPadding = self::removePadding($content);
+
// Fetch encryption metadata from end of file
- $meta = substr( $noPadding, -22 );
-
+ $meta = substr($noPadding, -22);
+
// Fetch IV from end of file
- $iv = substr( $meta, -16 );
-
+ $iv = substr($meta, -16);
+
// Fetch identifier from start of metadata
- $identifier = substr( $meta, 0, 6 );
-
- if ( $identifier == '00iv00') {
-
+ $identifier = substr($meta, 0, 6);
+
+ if ($identifier == '00iv00') {
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* Check if a file is encrypted according to database file cache
* @param string $path
* @return bool
*/
- public static function isEncryptedMeta( $path ) {
-
+ public static function isEncryptedMeta($path)
+ {
+
// TODO: Use DI to get \OC\Files\Filesystem out of here
-
+
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo( $path);
-
+ $metadata = \OC\Files\Filesystem::getFileInfo($path);
+
// Return encryption status
- return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
-
+ return isset($metadata['encrypted']) and ( bool )$metadata['encrypted'];
+
}
-
- /**
- * @brief Check if a file is encrypted via legacy system
- * @param string $relPath The path of the file, relative to user/data;
- * e.g. filename or /Docs/filename, NOT admin/files/filename
- * @return true / false
- */
- public static function isLegacyEncryptedContent( $data, $relPath ) {
+
+ /**
+ * @brief Check if a file is encrypted via legacy system
+ * @param $data
+ * @param string $relPath The path of the file, relative to user/data;
+ * e.g. filename or /Docs/filename, NOT admin/files/filename
+ * @return boolean
+ */
+ public static function isLegacyEncryptedContent($data, $relPath)
+ {
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
-
+ $metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');
+
// If a file is flagged with encryption in DB, but isn't a
// valid content + IV combination, it's probably using the
// legacy encryption system
- if (
- isset( $metadata['encrypted'] )
- and $metadata['encrypted'] === true
- and ! self::isCatfileContent( $data )
+ if (
+ isset($metadata['encrypted'])
+ and $metadata['encrypted'] === true
+ and !self::isCatfileContent($data)
) {
-
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
- /**
- * @brief Symmetrically encrypt a string
- * @returns encrypted file
- */
- public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
-
- if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+
+ /**
+ * @brief Symmetrically encrypt a string
+ * @return string encrypted file content
+ */
+ public static function encrypt($plainContent, $iv, $passphrase = '')
+ {
+
+ if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $encryptedContent;
-
+
} else {
-
- \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );
-
+
+ \OC_Log::write('Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR);
+
return false;
-
+
}
-
+
}
-
- /**
- * @brief Symmetrically decrypt a string
- * @returns decrypted file
- */
- public static function decrypt( $encryptedContent, $iv, $passphrase ) {
-
- if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+
+ /**
+ * @brief Symmetrically decrypt a string
+ * @return string decrypted file content
+ */
+ public static function decrypt($encryptedContent, $iv, $passphrase)
+ {
+
+ if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $plainContent;
-
-
+
+
} else {
-
- throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
-
+
+ throw new \Exception('Encryption library: Decryption (symmetric) of content failed');
+
return false;
-
+
}
-
+
}
-
- /**
- * @brief Concatenate encrypted data with its IV and padding
- * @param string $content content to be concatenated
- * @param string $iv IV to be concatenated
- * @returns string concatenated content
- */
- public static function concatIv ( $content, $iv ) {
-
+
+ /**
+ * @brief Concatenate encrypted data with its IV and padding
+ * @param string $content content to be concatenated
+ * @param string $iv IV to be concatenated
+ * @returns string concatenated content
+ */
+ public static function concatIv($content, $iv)
+ {
+
$combined = $content . '00iv00' . $iv;
-
+
return $combined;
-
+
}
-
- /**
- * @brief Split concatenated data and IV into respective parts
- * @param string $catFile concatenated data to be split
- * @returns array keys: encrypted, iv
- */
- public static function splitIv ( $catFile ) {
-
+
+ /**
+ * @brief Split concatenated data and IV into respective parts
+ * @param string $catFile concatenated data to be split
+ * @returns array keys: encrypted, iv
+ */
+ public static function splitIv($catFile)
+ {
+
// Fetch encryption metadata from end of file
- $meta = substr( $catFile, -22 );
-
+ $meta = substr($catFile, -22);
+
// Fetch IV from end of file
- $iv = substr( $meta, -16 );
-
+ $iv = substr($meta, -16);
+
// Remove IV and IV identifier text to expose encrypted content
- $encrypted = substr( $catFile, 0, -22 );
-
+ $encrypted = substr($catFile, 0, -22);
+
$split = array(
'encrypted' => $encrypted
- , 'iv' => $iv
+ , 'iv' => $iv
);
-
+
return $split;
-
+
}
-
- /**
- * @brief Symmetrically encrypts a string and returns keyfile content
- * @param $plainContent content to be encrypted in keyfile
- * @returns encrypted content combined with IV
- * @note IV need not be specified, as it will be stored in the returned keyfile
- * and remain accessible therein.
- */
- public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
-
- if ( !$plainContent ) {
-
+
+ /**
+ * @brief Symmetrically encrypts a string and returns keyfile content
+ * @param string $plainContent content to be encrypted in keyfile
+ * @param string $passphrase
+ * @return bool|string
+ * @return string encrypted content combined with IV
+ * @note IV need not be specified, as it will be stored in the returned keyfile
+ * and remain accessible therein.
+ */
+ public static function symmetricEncryptFileContent($plainContent, $passphrase = '')
+ {
+
+ if (!$plainContent) {
+
return false;
-
+
}
-
+
$iv = self::generateIv();
-
- if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
-
- // Combine content to encrypt with IV identifier and actual IV
- $catfile = self::concatIv( $encryptedContent, $iv );
-
- $padded = self::addPadding( $catfile );
-
- return $padded;
-
+
+ if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
+
+ // Combine content to encrypt with IV identifier and actual IV
+ $catfile = self::concatIv($encryptedContent, $iv);
+
+ $padded = self::addPadding($catfile);
+
+ return $padded;
+
} else {
-
- \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );
-
+
+ \OC_Log::write('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR);
+
return false;
-
+
}
-
+
}
/**
- * @brief Symmetrically decrypts keyfile content
- * @param string $source
- * @param string $target
- * @param string $key the decryption key
- * @returns decrypted content
- *
- * This function decrypts a file
- */
- public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
-
- if ( !$keyfileContent ) {
-
- throw new \Exception( 'Encryption library: no data provided for decryption' );
-
+ * @brief Symmetrically decrypts keyfile content
+ * @param $keyfileContent
+ * @param string $passphrase
+ * @throws \Exception
+ * @return bool|string
+ * @internal param string $source
+ * @internal param string $target
+ * @internal param string $key the decryption key
+ * @returns string decrypted content
+ *
+ * This function decrypts a file
+ */
+ public static function symmetricDecryptFileContent($keyfileContent, $passphrase = '')
+ {
+
+ if (!$keyfileContent) {
+
+ throw new \Exception('Encryption library: no data provided for decryption');
+
}
-
+
// Remove padding
- $noPadding = self::removePadding( $keyfileContent );
-
+ $noPadding = self::removePadding($keyfileContent);
+
// Split into enc data and catfile
- $catfile = self::splitIv( $noPadding );
-
- if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
-
+ $catfile = self::splitIv($noPadding);
+
+ if ($plainContent = self::decrypt($catfile['encrypted'], $catfile['iv'], $passphrase)) {
+
return $plainContent;
-
+
}
-
+
}
-
+
/**
- * @brief Creates symmetric keyfile content using a generated key
- * @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
- */
- public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
-
+ * @brief Creates symmetric keyfile content using a generated key
+ * @param string $plainContent content to be encrypted
+ * @returns array keys: key, encrypted
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
+ public static function symmetricEncryptFileContentKeyfile($plainContent)
+ {
+
$key = self::generateKey();
-
- if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
-
+
+ if ($encryptedContent = self::symmetricEncryptFileContent($plainContent, $key)) {
+
return array(
'key' => $key
- , 'encrypted' => $encryptedContent
+ , 'encrypted' => $encryptedContent
);
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
- * @brief Create asymmetrically encrypted keyfile content using a generated key
- * @param string $plainContent content to be encrypted
- * @param array $publicKeys array keys must be the userId of corresponding user
- * @returns array keys: keys (array, key = userId), data
- * @note symmetricDecryptFileContent() can decrypt files created using this method
- */
- public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
-
+ * @brief Create asymmetrically encrypted keyfile content using a generated key
+ * @param string $plainContent content to be encrypted
+ * @param array $publicKeys array keys must be the userId of corresponding user
+ * @returns array keys: keys (array, key = userId), data
+ * @note symmetricDecryptFileContent() can decrypt files created using this method
+ */
+ public static function multiKeyEncrypt($plainContent, array $publicKeys)
+ {
+
// openssl_seal returns false without errors if $plainContent
// is empty, so trigger our own error
- if ( empty( $plainContent ) ) {
-
- trigger_error( "Cannot mutliKeyEncrypt empty plain content" );
- throw new \Exception( 'Cannot mutliKeyEncrypt empty plain content' );
-
+ if (empty($plainContent)) {
+
+ trigger_error("Cannot mutliKeyEncrypt empty plain content");
+ throw new \Exception('Cannot mutliKeyEncrypt empty plain content');
+
}
-
+
// Set empty vars to be set by openssl by reference
$sealed = '';
$shareKeys = array();
-
- if( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {
-
+
+ if (openssl_seal($plainContent, $sealed, $shareKeys, $publicKeys)) {
+
$i = 0;
-
+
// Ensure each shareKey is labelled with its
// corresponding userId
- foreach ( $publicKeys as $userId => $publicKey ) {
-
+ foreach ($publicKeys as $userId => $publicKey) {
+
$mappedShareKeys[$userId] = $shareKeys[$i];
$i++;
-
+
}
-
+
return array(
'keys' => $mappedShareKeys
- , 'data' => $sealed
+ , 'data' => $sealed
);
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
- * @brief Asymmetrically encrypt a file using multiple public keys
- * @param string $plainContent content to be encrypted
- * @returns string $plainContent decrypted string
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
- */
- public static function multiKeyDecrypt( $encryptedContent, $shareKey, $privateKey ) {
-
- if ( !$encryptedContent ) {
-
+ * @brief Asymmetrically encrypt a file using multiple public keys
+ * @param $encryptedContent
+ * @param $shareKey
+ * @param $privateKey
+ * @return bool
+ * @internal param string $plainContent content to be encrypted
+ * @returns string $plainContent decrypted string
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
+ public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey)
+ {
+
+ if (!$encryptedContent) {
+
return false;
-
+
}
-
- if ( openssl_open( $encryptedContent, $plainContent, $shareKey, $privateKey ) ) {
-
+
+ if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {
+
return $plainContent;
-
+
} else {
-
- \OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
-
+
+ \OC_Log::write('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR);
+
return false;
-
+
}
-
+
}
-
- /**
- * @brief Asymetrically encrypt a string using a public key
- * @returns encrypted file
- */
- public static function keyEncrypt( $plainContent, $publicKey ) {
-
- openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
-
+
+ /**
+ * @brief Asymetrically encrypt a string using a public key
+ * @return string encrypted file
+ */
+ public static function keyEncrypt($plainContent, $publicKey)
+ {
+
+ openssl_public_encrypt($plainContent, $encryptedContent, $publicKey);
+
return $encryptedContent;
-
+
}
-
- /**
- * @brief Asymetrically decrypt a file using a private key
- * @returns decrypted file
- */
- public static function keyDecrypt( $encryptedContent, $privatekey ) {
-
- $result = @openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
-
- if ( $result ) {
+
+ /**
+ * @brief Asymetrically decrypt a file using a private key
+ * @return string decrypted file
+ */
+ public static function keyDecrypt($encryptedContent, $privatekey)
+ {
+
+ $result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);
+
+ if ($result) {
return $plainContent;
}
return $result;
-
+
}
-
+
/**
* @brief Generates a pseudo random initialisation vector
* @return String $iv generated IV
*/
- public static function generateIv() {
-
- if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
-
- if ( !$strong ) {
-
+ public static function generateIv()
+ {
+
+ if ($random = openssl_random_pseudo_bytes(12, $strong)) {
+
+ if (!$strong) {
+
// If OpenSSL indicates randomness is insecure, log error
- \OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );
-
+ \OC_Log::write('Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN);
+
}
-
+
// We encode the iv purely for string manipulation
// purposes - it gets decoded before use
- $iv = base64_encode( $random );
-
+ $iv = base64_encode($random);
+
return $iv;
-
+
} else {
-
- throw new Exception( 'Generating IV failed' );
-
+
+ throw new \Exception('Generating IV failed');
+
}
-
+
}
-
+
/**
* @brief Generate a pseudo random 1024kb ASCII key
* @returns $key Generated key
*/
- public static function generateKey() {
-
+ public static function generateKey()
+ {
+
// Generate key
- if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
-
- if ( !$strong ) {
-
+ if ($key = base64_encode(openssl_random_pseudo_bytes(183, $strong))) {
+
+ if (!$strong) {
+
// If OpenSSL indicates randomness is insecure, log error
- throw new Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
-
+ throw new \Exception('Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()');
+
}
-
+
return $key;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
/**
@@ -535,70 +562,89 @@ class Crypt {
*
* if the key is left out, the default handeler will be used
*/
- public static function getBlowfish( $key = '' ) {
-
- if ( $key ) {
-
- return new \Crypt_Blowfish( $key );
-
+ public static function getBlowfish($key = '')
+ {
+
+ if ($key) {
+
+ return new \Crypt_Blowfish($key);
+
} else {
-
+
return false;
-
+
}
-
+
}
-
- public static function legacyCreateKey( $passphrase ) {
-
+
+ /**
+ * @param $passphrase
+ * @return mixed
+ */
+ public static function legacyCreateKey($passphrase)
+ {
+
// Generate a random integer
- $key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
+ $key = mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999);
// Encrypt the key with the passphrase
- $legacyEncKey = self::legacyEncrypt( $key, $passphrase );
+ $legacyEncKey = self::legacyEncrypt($key, $passphrase);
return $legacyEncKey;
-
+
}
/**
* @brief encrypts content using legacy blowfish system
- * @param $content the cleartext message you want to encrypt
- * @param $key the encryption key (optional)
- * @returns encrypted content
+ * @param string $content the cleartext message you want to encrypt
+ * @param string $passphrase
+ * @return
+ * @internal param \OCA\Encryption\the $key encryption key (optional)
+ * @returns string encrypted content
*
* This function encrypts an content
*/
- public static function legacyEncrypt( $content, $passphrase = '' ) {
-
- $bf = self::getBlowfish( $passphrase );
-
- return $bf->encrypt( $content );
-
+ public static function legacyEncrypt($content, $passphrase = '')
+ {
+
+ $bf = self::getBlowfish($passphrase);
+
+ return $bf->encrypt($content);
+
}
-
+
/**
- * @brief decrypts content using legacy blowfish system
- * @param $content the cleartext message you want to decrypt
- * @param $key the encryption key (optional)
- * @returns cleartext content
- *
- * This function decrypts an content
- */
- public static function legacyDecrypt( $content, $passphrase = '' ) {
-
- $bf = self::getBlowfish( $passphrase );
-
- $decrypted = $bf->decrypt( $content );
-
+ * @brief decrypts content using legacy blowfish system
+ * @param string $content the cleartext message you want to decrypt
+ * @param string $passphrase
+ * @return string
+ * @internal param \OCA\Encryption\the $key encryption key (optional)
+ * @return string cleartext content
+ *
+ * This function decrypts an content
+ */
+ public static function legacyDecrypt($content, $passphrase = '')
+ {
+
+ $bf = self::getBlowfish($passphrase);
+
+ $decrypted = $bf->decrypt($content);
+
return rtrim($decrypted, "\0");;
-
+
}
- private static function legacyBlockDecrypt($data, $key='',$maxLength=0) {
+ /**
+ * @param $data
+ * @param string $key
+ * @param int $maxLength
+ * @return string
+ */
+ private static function legacyBlockDecrypt($data, $key = '', $maxLength = 0)
+ {
$result = '';
while (strlen($data)) {
- $result.=self::legacyDecrypt(substr($data, 0, 8192), $key);
+ $result .= self::legacyDecrypt(substr($data, 0, 8192), $key);
$data = substr($data, 8192);
}
if ($maxLength > 0) {
@@ -607,19 +653,28 @@ class Crypt {
return rtrim($result, "\0");
}
}
-
- public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
-
- $decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );
+
+ /**
+ * @param $legacyEncryptedContent
+ * @param $legacyPassphrase
+ * @param $publicKeys
+ * @param $newPassphrase
+ * @param $path
+ * @return array
+ */
+ public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path)
+ {
+
+ $decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);
// Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );
+ $cryptedData = self::symmetricEncryptFileContentKeyfile($decrypted);
// Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );
+ $multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);
+
+ return array('data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys']);
- return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
-
}
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index a04c65e251..c57f0bc009 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -23,76 +23,82 @@
namespace OCA\Encryption;
-/**
- * @brief Class to manage registration of hooks an various helper methods
- */
+ /**
+ * @brief Class to manage registration of hooks an various helper methods
+ */
/**
* Class Helper
* @package OCA\Encryption
*/
-class Helper {
-
+class Helper
+{
+
/**
* @brief register share related hooks
- *
+ *
+ */
+ public static function registerShareHooks()
+ {
+
+ \OCP\Util::connectHook('OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared');
+ \OCP\Util::connectHook('OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared');
+ \OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare');
+ }
+
+ /**
+ * @brief register user related hooks
+ *
*/
- public static function registerShareHooks() {
+ public static function registerUserHooks()
+ {
- \OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
- \OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
- \OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
+ \OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login');
+ \OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase');
+ \OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
+ \OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
}
- /**
- * @brief register user related hooks
- *
- */
- public static function registerUserHooks() {
-
- \OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
- \OCP\Util::connectHook( 'OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
- \OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
- \OCP\Util::connectHook( 'OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser' );
- }
-
- /**
- * @brief register webdav related hooks
- *
- */
- public static function registerWebdavHooks() {
-
-
- }
-
- /**
- * @brief register filesystem related hooks
- *
- */
- public static function registerFilesystemHooks() {
-
- \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
- }
-
- /**
- * @brief setup user for files_encryption
- *
- * @param Util $util
- * @param string $password
- * @return bool
- */
- public static function setupUser($util, $password) {
- // Check files_encryption infrastructure is ready for action
- if ( ! $util->ready() ) {
-
- \OC_Log::write( 'Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
-
- if(!$util->setupServerSide( $password )) {
- return false;
- }
- }
-
- return true;
- }
+ /**
+ * @brief register webdav related hooks
+ *
+ */
+ public static function registerWebdavHooks()
+ {
+
+
+ }
+
+ /**
+ * @brief register filesystem related hooks
+ *
+ */
+ public static function registerFilesystemHooks()
+ {
+
+ \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+ }
+
+ /**
+ * @brief setup user for files_encryption
+ *
+ * @param Util $util
+ * @param string $password
+ * @return bool
+ */
+ public static function setupUser($util, $password)
+ {
+ // Check files_encryption infrastructure is ready for action
+ if (!$util->ready()) {
+
+ \OC_Log::write('Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG);
+
+ if (!$util->setupServerSide($password)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
/**
* @brief enable recovery
@@ -103,7 +109,8 @@ class Helper {
* @internal param string $password
* @return bool
*/
- public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
+ public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword)
+ {
$view = new \OC\Files\View('/');
if ($recoveryKeyId === null) {
@@ -139,7 +146,7 @@ class Helper {
$view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
// create control file which let us check later on if the entered password was correct.
- $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
+ $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
if (!$view->is_dir('/control-file')) {
$view->mkdir('/control-file');
}
@@ -170,7 +177,8 @@ class Helper {
* @param $recoveryPassword
* @return bool
*/
- public static function adminDisableRecovery($recoveryPassword) {
+ public static function adminDisableRecovery($recoveryPassword)
+ {
$util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
$return = $util->checkRecoveryPassword($recoveryPassword);
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index b422ff099b..1bc334e7a1 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -27,7 +27,8 @@ namespace OCA\Encryption;
* @brief Class to manage storage and retrieval of encryption keys
* @note Where a method requires a view object, it's root must be '/'
*/
-class Keymanager {
+class Keymanager
+{
/**
* @brief retrieve the ENCRYPTED private key from a user
@@ -37,17 +38,18 @@ class Keymanager {
* @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
- public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
-
- $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
+ public static function getPrivateKey(\OC_FilesystemView $view, $user)
+ {
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ $path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
- $key = $view->file_get_contents( $path );
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $key = $view->file_get_contents($path);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
- \OC_FileProxy::$enabled = $proxyStatus;
-
return $key;
}
@@ -57,104 +59,111 @@ class Keymanager {
* @param $userId
* @return string public key or false
*/
- public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+ public static function getPublicKey(\OC_FilesystemView $view, $userId)
+ {
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- $result = $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
-
+
+ $result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
+
\OC_FileProxy::$enabled = $proxyStatus;
- return $result;
-
+ return $result;
+
}
-
+
/**
* @brief Retrieve a user's public and private key
* @param \OC_FilesystemView $view
* @param $userId
* @return array keys: privateKey, publicKey
*/
- public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
-
+ public static function getUserKeys(\OC_FilesystemView $view, $userId)
+ {
+
return array(
- 'publicKey' => self::getPublicKey( $view, $userId )
- , 'privateKey' => self::getPrivateKey( $view, $userId )
+ 'publicKey' => self::getPublicKey($view, $userId)
+ , 'privateKey' => self::getPrivateKey($view, $userId)
);
-
+
}
-
+
/**
* @brief Retrieve public keys for given users
* @param \OC_FilesystemView $view
* @param array $userIds
* @return array of public keys for the specified users
*/
- public static function getPublicKeys( \OC_FilesystemView $view, array $userIds ) {
-
+ public static function getPublicKeys(\OC_FilesystemView $view, array $userIds)
+ {
+
$keys = array();
-
- foreach ( $userIds as $userId ) {
-
- $keys[$userId] = self::getPublicKey( $view, $userId );
-
+
+ foreach ($userIds as $userId) {
+
+ $keys[$userId] = self::getPublicKey($view, $userId);
+
}
-
+
return $keys;
-
+
}
-
+
/**
* @brief store file encryption key
*
+ * @param \OC_FilesystemView $view
* @param string $path relative path of the file, including filename
- * @param string $key
+ * @param $userId
+ * @param $catfile
+ * @internal param string $key
* @return bool true/false
- * @note The keyfile is not encrypted here. Client code must
+ * @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
-
+ public static function setFileKey(\OC_FilesystemView $view, $path, $userId, $catfile)
+ {
+
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util( $view, \OCP\User::getUser() );
- list( $owner, $filename ) = $util->getUidAndFilename( $path );
+ $util = new Util($view, \OCP\User::getUser());
+ list($owner, $filename) = $util->getUidAndFilename($path);
$basePath = '/' . $owner . '/files_encryption/keyfiles';
-
- $targetPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
-
- if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
+
+ $targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+
+ if (!$view->is_dir($basePath . '/' . $targetPath)) {
// create all parent folders
- $info = pathinfo( $basePath . '/' . $targetPath );
- $keyfileFolderName = $view->getLocalFolder( $info['dirname'] );
-
- if ( ! file_exists( $keyfileFolderName ) ) {
-
- mkdir( $keyfileFolderName, 0750, true );
-
+ $info = pathinfo($basePath . '/' . $targetPath);
+ $keyfileFolderName = $view->getLocalFolder($info['dirname']);
+
+ if (!file_exists($keyfileFolderName)) {
+
+ mkdir($keyfileFolderName, 0750, true);
+
}
}
// try reusing key file if part file
- if ( self::isPartialFilePath( $targetPath ) ) {
-
- $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
-
+ if (self::isPartialFilePath($targetPath)) {
+
+ $result = $view->file_put_contents($basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile);
+
} else {
-
- $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
+
+ $result = $view->file_put_contents($basePath . '/' . $targetPath . '.key', $catfile);
+
}
-
+
\OC_FileProxy::$enabled = $proxyStatus;
-
+
return $result;
-
+
}
/**
@@ -163,15 +172,16 @@ class Keymanager {
* @return string File path without .part extension
* @note this is needed for reusing keys
*/
- public static function fixPartialFilePath( $path ) {
-
+ public static function fixPartialFilePath($path)
+ {
+
if (preg_match('/\.part$/', $path)) {
$newLength = strlen($path) - 5;
$fPath = substr($path, 0, $newLength);
return $fPath;
-
+
} else {
return $path;
@@ -185,19 +195,21 @@ class Keymanager {
* @param string $path Path that may identify a .part file
* @return bool
*/
- public static function isPartialFilePath( $path ) {
-
- if ( preg_match('/\.part$/', $path ) ) {
-
+ public static function isPartialFilePath($path)
+ {
+
+ if (preg_match('/\.part$/', $path)) {
+
return true;
-
+
} else {
-
+
return false;
-
+
}
}
+
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
@@ -208,227 +220,239 @@ class Keymanager {
* @note The keyfile returned is asymmetrically encrypted. Decryption
* of the keyfile must be performed by client code
*/
- public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+ public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath)
+ {
// try reusing key file if part file
- if ( self::isPartialFilePath( $filePath ) ) {
-
- $result = self::getFileKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
-
- if ( $result ) {
-
+ if (self::isPartialFilePath($filePath)) {
+
+ $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
+
+ if ($result) {
+
return $result;
-
+
}
-
+
}
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $filePath_f = ltrim( $filename, '/' );
+ $filePath_f = ltrim($filename, '/');
$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- if ( $view->file_exists( $keyfilePath ) ) {
- $result = $view->file_get_contents( $keyfilePath );
-
+ if ($view->file_exists($keyfilePath)) {
+
+ $result = $view->file_get_contents($keyfilePath);
+
} else {
-
- $result = false;
-
+
+ $result = false;
+
}
-
+
\OC_FileProxy::$enabled = $proxyStatus;
-
+
return $result;
-
+
}
-
+
/**
* @brief Delete a keyfile
*
- * @param OC_FilesystemView $view
+ * @param \OC_FilesystemView $view
* @param string $userId username
* @param string $path path of the file the key belongs to
* @return bool Outcome of unlink operation
* @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
* /data/admin/files/mydoc.txt
*/
- public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+ public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path)
+ {
+
+ $trimmed = ltrim($path, '/');
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
$result = false;
- if ( $view->is_dir($keyPath) ) {
+ if ($view->is_dir($keyPath)) {
$result = $view->unlink($keyPath);
- } else if ( $view->file_exists( $keyPath.'.key' ) ) {
+ } else if ($view->file_exists($keyPath . '.key')) {
- $result = $view->unlink( $keyPath.'.key' );
+ $result = $view->unlink($keyPath . '.key');
}
- if ( !$result ) {
-
- \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
+ if (!$result) {
+
+ \OC_Log::write('Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR);
}
return $result;
-
+
}
-
+
/**
* @brief store private key from the user
- * @param string key
+ * @param string $key
* @return bool
* @note Encryption of the private key must be performed by client code
* as no encryption takes place here
*/
- public static function setPrivateKey( $key ) {
-
+ public static function setPrivateKey($key)
+ {
+
$user = \OCP\User::getUser();
-
- $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+
+ $view = new \OC_FilesystemView('/' . $user . '/files_encryption');
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
-
- $result = $view->file_put_contents( $user . '.private.key', $key );
-
+
+ if (!$view->file_exists('')) $view->mkdir('');
+
+ $result = $view->file_put_contents($user . '.private.key', $key);
+
\OC_FileProxy::$enabled = $proxyStatus;
return $result;
-
+
}
-
+
/**
* @brief store private keys from the user
*
- * @param string privatekey
- * @param string publickey
+ * @param string $privatekey
+ * @param string $publickey
* @return bool true/false
*/
- public static function setUserKeys($privatekey, $publickey) {
-
- return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
-
+ public static function setUserKeys($privatekey, $publickey)
+ {
+
+ return (self::setPrivateKey($privatekey) && self::setPublicKey($publickey));
+
}
-
+
/**
* @brief store public key of the user
*
- * @param string key
+ * @param string $key
* @return bool true/false
*/
- public static function setPublicKey( $key ) {
-
- $view = new \OC_FilesystemView( '/public-keys' );
+ public static function setPublicKey($key)
+ {
+
+ $view = new \OC_FilesystemView('/public-keys');
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
-
- $result = $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
-
+
+ if (!$view->file_exists('')) $view->mkdir('');
+
+ $result = $view->file_put_contents(\OCP\User::getUser() . '.public.key', $key);
+
\OC_FileProxy::$enabled = $proxyStatus;
return $result;
-
+
}
-
+
/**
* @brief store share key
*
+ * @param \OC_FilesystemView $view
* @param string $path relative path of the file, including filename
- * @param string $key
- * @param null $view
- * @param string $dbClassName
+ * @param $userId
+ * @param $shareKey
+ * @internal param string $key
+ * @internal param string $dbClassName
* @return bool true/false
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
+ public static function setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey)
+ {
// Here we need the currently logged in user, while userId can be a different user
- $util = new Util( $view, \OCP\User::getUser() );
+ $util = new Util($view, \OCP\User::getUser());
- list( $owner, $filename ) = $util->getUidAndFilename( $path );
+ list($owner, $filename) = $util->getUidAndFilename($path);
$basePath = '/' . $owner . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
+
+ $shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
// try reusing key file if part file
- if(self::isPartialFilePath($shareKeyPath)) {
-
+ if (self::isPartialFilePath($shareKeyPath)) {
+
$writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
-
+
} else {
-
+
$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
-
+
}
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $result = $view->file_put_contents( $writePath, $shareKey );
+ $result = $view->file_put_contents($writePath, $shareKey);
\OC_FileProxy::$enabled = $proxyStatus;
- if (
- is_int( $result )
+ if (
+ is_int($result)
&& $result > 0
) {
-
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief store multiple share keys for a single file
+ * @param \OC_FilesystemView $view
+ * @param $path
+ * @param array $shareKeys
* @return bool
*/
- public static function setShareKeys( \OC_FilesystemView $view, $path, array $shareKeys ) {
+ public static function setShareKeys(\OC_FilesystemView $view, $path, array $shareKeys)
+ {
// $shareKeys must be an array with the following format:
// [userId] => [encrypted key]
-
+
$result = true;
-
- foreach ( $shareKeys as $userId => $shareKey ) {
-
- if ( ! self::setShareKey( $view, $path, $userId, $shareKey ) ) {
-
+
+ foreach ($shareKeys as $userId => $shareKey) {
+
+ if (!self::setShareKey($view, $path, $userId, $shareKey)) {
+
// If any of the keys are not set, flag false
$result = false;
-
+
}
-
+
}
-
+
// Returns false if any of the keys weren't set
return $result;
-
+
}
-
+
/**
* @brief retrieve shareKey for an encrypted file
* @param \OC_FilesystemView $view
@@ -439,59 +463,61 @@ class Keymanager {
* @note The sharekey returned is encrypted. Decryption
* of the keyfile must be performed by client code
*/
- public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+ public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath)
+ {
// try reusing key file if part file
- if(self::isPartialFilePath($filePath)) {
-
+ if (self::isPartialFilePath($filePath)) {
+
$result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
-
- if($result) {
-
+
+ if ($result) {
+
return $result;
-
+
}
-
+
}
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util( $view, \OCP\User::getUser() );
+ $util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
$shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
- if ( $view->file_exists( $shareKeyPath ) ) {
-
- $result = $view->file_get_contents( $shareKeyPath );
-
+ if ($view->file_exists($shareKeyPath)) {
+
+ $result = $view->file_get_contents($shareKeyPath);
+
} else {
-
+
$result = false;
-
+
}
-
+
\OC_FileProxy::$enabled = $proxyStatus;
-
+
return $result;
-
+
}
/**
* @brief delete all share keys of a given file
* @param \OC_FilesystemView $view
- * @param type $userId owner of the file
- * @param type $filePath path to the file, relative to the owners file dir
+ * @param string $userId owner of the file
+ * @param string $filePath path to the file, relative to the owners file dir
*/
- public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
-
- if ($view->is_dir($userId.'/files/'.$filePath)) {
- $view->unlink($userId.'/files_encryption/share-keys/'.$filePath);
+ public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath)
+ {
+
+ if ($view->is_dir($userId . '/files/' . $filePath)) {
+ $view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
} else {
- $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$filePath);
- $matches = glob(preg_quote($localKeyPath).'*.shareKey');
+ $localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
+ $matches = glob(preg_quote($localKeyPath) . '*.shareKey');
foreach ($matches as $ma) {
unlink($ma);
}
@@ -501,13 +527,14 @@ class Keymanager {
/**
* @brief Delete a single user's shareKey for a single file
*/
- public static function delShareKey( \OC_FilesystemView $view, $userIds, $filePath ) {
+ public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath)
+ {
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util( $view, \OCP\User::getUser() );
+ $util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
@@ -515,7 +542,7 @@ class Keymanager {
$result = false;
- if ( $view->is_dir($shareKeyPath) ) {
+ if ($view->is_dir($shareKeyPath)) {
$localPath = \OC_Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
$result = self::recursiveDelShareKeys($localPath, $userIds);
@@ -523,40 +550,42 @@ class Keymanager {
} else {
foreach ($userIds as $userId) {
- $view->unlink($shareKeyPath.'.'.$userId.'.shareKey');
+ $view->unlink($shareKeyPath . '.' . $userId . '.shareKey');
}
$result = true;
}
- if ( ! $result ) {
-
- \OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR );
-
+ if (!$result) {
+
+ \OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR);
+
}
-
+
\OC_FileProxy::$enabled = $proxyStatus;
-
+
return $result;
-
+
}
/**
* @brief recursively delete share keys from given users
*
- * @param type $dir directory
- * @param type $userIds user ids for which the share keys should be deleted
+ * @param string $dir directory
+ * @param array $userIds user ids for which the share keys should be deleted
*/
- private static function recursiveDelShareKeys($dir, $userIds) {
+ private static function recursiveDelShareKeys($dir, $userIds)
+ {
foreach ($userIds as $userId) {
- $completePath = $dir.'/.*'.'.'.$userId.'.shareKey';
- $matches = glob(preg_quote($dir).'/*'.preg_quote('.'.$userId.'.shareKey'));
+ $completePath = $dir . '/.*' . '.' . $userId . '.shareKey';
+ $matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
}
- foreach ($matches as $ma) {
+ /** @var $matches array */
+ foreach ($matches as $ma) {
unlink($ma);
}
- $subdirs = $directories = glob(preg_quote($dir) . '/*' , GLOB_ONLYDIR);
- foreach ( $subdirs as $subdir ) {
+ $subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
+ foreach ($subdirs as $subdir) {
self::recursiveDelShareKeys($subdir, $userIds);
}
return true;
@@ -565,16 +594,17 @@ class Keymanager {
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
- public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
-
- $targetPath = ltrim( $path, '/' );
-
- $path_parts = pathinfo( $targetPath );
-
+ public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId)
+ {
+
+ $targetPath = ltrim($path, '/');
+
+ $path_parts = pathinfo($targetPath);
+
// If the file resides within a subdirectory, create it
- if (
- isset( $path_parts['dirname'] )
- && ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
+ if (
+ isset($path_parts['dirname'])
+ && !$view->file_exists($basePath . '/' . $path_parts['dirname'])
) {
$sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
$dir = '';
@@ -585,41 +615,26 @@ class Keymanager {
}
}
}
-
+
return $targetPath;
-
- }
-
- /**
- * @brief change password of private encryption key
- *
- * @param string $oldpasswd old password
- * @param string $newpasswd new password
- * @return bool true/false
- */
- public static function changePasswd($oldpasswd, $newpasswd) {
-
- if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
- return Crypt::changekeypasscode($oldpasswd, $newpasswd);
- }
- return false;
-
+
}
-
+
/**
* @brief Fetch the legacy encryption key from user files
- * @param string $login used to locate the legacy key
- * @param string $passphrase used to decrypt the legacy key
- * @return true / false
+ * @internal param string $login used to locate the legacy key
+ * @internal param string $passphrase used to decrypt the legacy key
+ * @return boolean
*
* if the key is left out, the default handeler will be used
*/
- public function getLegacyKey() {
-
+ public function getLegacyKey()
+ {
+
$user = \OCP\User::getUser();
- $view = new \OC_FilesystemView( '/' . $user );
- return $view->file_get_contents( 'encryption.key' );
-
+ $view = new \OC_FilesystemView('/' . $user);
+ return $view->file_get_contents('encryption.key');
+
}
-
+
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 1d60770b4d..55ad882a8f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -1,41 +1,46 @@
<?php
/**
-* ownCloud
-*
-* @author Sam Tuke, Robin Appelman
-* @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
-* icewind1991@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Sam Tuke, Robin Appelman
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
+ * icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
/**
-* @brief Encryption proxy which handles filesystem operations before and after
-* execution and encrypts, and handles keyfiles accordingly. Used for
-* webui.
-*/
+ * @brief Encryption proxy which handles filesystem operations before and after
+ * execution and encrypts, and handles keyfiles accordingly. Used for
+ * webui.
+ */
namespace OCA\Encryption;
-class Proxy extends \OC_FileProxy {
+/**
+ * Class Proxy
+ * @package OCA\Encryption
+ */
+class Proxy extends \OC_FileProxy
+{
private static $blackList = null; //mimetypes blacklisted from encryption
-
+
private static $enableEncryption = null;
-
+
/**
* Check if a file requires encryption
* @param string $path
@@ -43,461 +48,481 @@ class Proxy extends \OC_FileProxy {
*
* Tests if server side encryption is enabled, and file is allowed by blacklists
*/
- private static function shouldEncrypt( $path ) {
-
- if ( is_null( self::$enableEncryption ) ) {
-
- if (
- \OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
- && Crypt::mode() == 'server'
+ private static function shouldEncrypt($path)
+ {
+
+ if (is_null(self::$enableEncryption)) {
+
+ if (
+ \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') == 'true'
+ && Crypt::mode() == 'server'
) {
-
+
self::$enableEncryption = true;
-
+
} else {
-
+
self::$enableEncryption = false;
-
+
}
-
+
}
-
- if ( !self::$enableEncryption ) {
-
+
+ if (!self::$enableEncryption) {
+
return false;
-
+
}
-
- if ( is_null(self::$blackList ) ) {
-
- self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
-
+
+ if (is_null(self::$blackList)) {
+
+ self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
+
}
-
- if ( Crypt::isCatfileContent( $path ) ) {
-
+
+ if (Crypt::isCatfileContent($path)) {
+
return true;
-
+
}
-
- $extension = substr( $path, strrpos( $path, '.' ) +1 );
-
- if ( array_search( $extension, self::$blackList ) === false ) {
-
+
+ $extension = substr($path, strrpos($path, '.') + 1);
+
+ if (array_search($extension, self::$blackList) === false) {
+
return true;
-
+
}
-
+
return false;
}
-
- public function preFile_put_contents( $path, &$data ) {
- if ( self::shouldEncrypt( $path ) ) {
+ /**
+ * @param $path
+ * @param $data
+ * @return bool
+ */
+ public function preFile_put_contents($path, &$data)
+ {
+
+ if (self::shouldEncrypt($path)) {
// Stream put contents should have been converted to fopen
- if ( !is_resource( $data ) ) {
+ if (!is_resource($data)) {
$userId = \OCP\USER::getUser();
- $view = new \OC_FilesystemView( '/' );
- $util = new Util( $view, $userId );
- $session = new Session( $view );
+ $view = new \OC_FilesystemView('/');
+ $util = new Util($view, $userId);
+ $session = new Session($view);
$privateKey = $session->getPrivateKey();
- $filePath = $util->stripUserFilesPath( $path );
+ $filePath = $util->stripUserFilesPath($path);
// Set the filesize for userland, before encrypting
- $size = strlen( $data );
-
+ $size = strlen($data);
+
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
// Check if there is an existing key we can reuse
- if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
-
+ if ($encKeyfile = Keymanager::getFileKey($view, $userId, $filePath)) {
+
// Fetch shareKey
- $shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
-
+ $shareKey = Keymanager::getShareKey($view, $userId, $filePath);
+
// Decrypt the keyfile
- $plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
-
+ $plainKey = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
} else {
-
+
// Make a new key
$plainKey = Crypt::generateKey();
-
+
}
-
+
// Encrypt data
- $encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
-
+ $encData = Crypt::symmetricEncryptFileContent($data, $plainKey);
+
$sharingEnabled = \OCP\Share::isEnabled();
// if file exists try to get sharing users
- if($view->file_exists($path)) {
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
+ if ($view->file_exists($path)) {
+ $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $filePath, $userId);
} else {
$uniqueUserIds[] = $userId;
}
// Fetch public keys for all users who will share the file
- $publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
+ $publicKeys = Keymanager::getPublicKeys($view, $uniqueUserIds);
// Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
-
+ $multiEncrypted = Crypt::multiKeyEncrypt($plainKey, $publicKeys);
+
// Save sharekeys to user folders
- Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
-
+ Keymanager::setShareKeys($view, $filePath, $multiEncrypted['keys']);
+
// Set encrypted keyfile as common varname
$encKey = $multiEncrypted['data'];
-
+
// Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
+ Keymanager::setFileKey($view, $filePath, $userId, $encKey);
// Replace plain content with encrypted content by reference
$data = $encData;
-
+
// Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted'=>true, 'size' => strlen($size), 'unencrypted_size' => $size), '' );
+ \OC\Files\Filesystem::putFileInfo($filePath, array('encrypted' => true, 'size' => strlen($size), 'unencrypted_size' => $size), '');
// Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
-
+
}
}
return true;
-
+
}
-
+
/**
* @param string $path Path of file from which has been read
* @param string $data Data that has been read from file
*/
- public function postFile_get_contents( $path, $data ) {
+ public function postFile_get_contents($path, $data)
+ {
+
+ // FIXME: $path for shared files is just /uid/files/Shared/filepath
- // FIXME: $path for shared files is just /uid/files/Shared/filepath
-
$userId = \OCP\USER::getUser();
- $view = new \OC_FilesystemView( '/' );
- $util = new Util( $view, $userId );
-
- $relPath = $util->stripUserFilesPath( $path );
-
-
+ $view = new \OC_FilesystemView('/');
+ $util = new Util($view, $userId);
+
+ $relPath = $util->stripUserFilesPath($path);
+
+
// TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
// Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // If data is a catfile
- if (
- Crypt::mode() == 'server'
- && Crypt::isCatfileContent( $data ) // TODO: Do we really need this check? Can't we assume it is properly encrypted?
+ // If data is a catfile
+ if (
+ Crypt::mode() == 'server'
+ && Crypt::isCatfileContent($data) // TODO: Do we really need this check? Can't we assume it is properly encrypted?
) {
-
+
// TODO: use get owner to find correct location of key files for shared files
- $session = new Session( $view );
- $privateKey = $session->getPrivateKey( $userId );
-
+ $session = new Session($view);
+ $privateKey = $session->getPrivateKey($userId);
+
// Get the encrypted keyfile
- $encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
-
+ $encKeyfile = Keymanager::getFileKey($view, $userId, $relPath);
+
// Attempt to fetch the user's shareKey
- $shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
-
+ $shareKey = Keymanager::getShareKey($view, $userId, $relPath);
+
// Decrypt keyfile with shareKey
- $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
-
- $plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+ $plainData = Crypt::symmetricDecryptFileContent($data, $plainKeyfile);
} elseif (
- Crypt::mode() == 'server'
- && isset( $_SESSION['legacyenckey'] )
- && Crypt::isEncryptedMeta( $path )
+ Crypt::mode() == 'server'
+ && isset($_SESSION['legacyenckey'])
+ && Crypt::isEncryptedMeta($path)
) {
-
- $plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
-
+
+ $plainData = Crypt::legacyDecrypt($data, $session->getLegacyKey());
+
}
-
+
\OC_FileProxy::$enabled = $proxyStatus;
-
- if ( ! isset( $plainData ) ) {
-
+
+ if (!isset($plainData)) {
+
$plainData = $data;
-
+
}
-
+
return $plainData;
-
+
}
-
+
/**
* @brief When a file is deleted, remove its keyfile also
*/
- public function preUnlink( $path ) {
-
+ public function preUnlink($path)
+ {
+
// let the trashbin handle this
- if ( \OCP\App::isEnabled('files_trashbin') ) {
- return true;
+ if (\OCP\App::isEnabled('files_trashbin')) {
+ return true;
}
-
+
// Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $view = new \OC_FilesystemView( '/' );
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $view = new \OC_FilesystemView('/');
$userId = \OCP\USER::getUser();
- $util = new Util( $view, $userId );
+ $util = new Util($view, $userId);
// Format path to be relative to user files dir
- $relPath = $util->stripUserFilesPath( $path );
+ $relPath = $util->stripUserFilesPath($path);
- list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
+ list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
// Delete keyfile & shareKey so it isn't orphaned
if (
- ! (
- Keymanager::deleteFileKey( $view, $owner, $ownerPath )
- && Keymanager::delAllShareKeys( $view, $owner, $ownerPath )
+ !(
+ Keymanager::deleteFileKey($view, $owner, $ownerPath)
+ && Keymanager::delAllShareKeys($view, $owner, $ownerPath)
)
) {
-
- \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "'.$ownerPath.'"', \OC_Log::ERROR );
-
+
+ \OC_Log::write('Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR);
+
}
-
+
\OC_FileProxy::$enabled = $proxyStatus;
-
+
// If we don't return true then file delete will fail; better
// to leave orphaned keyfiles than to disallow file deletion
return true;
-
+
}
/**
- * @brief When a file is renamed, rename its keyfile also
- * @return bool Result of rename()
- * @note This is pre rather than post because using post didn't work
- */
- public function postWrite( $path )
- {
- $this->handleFile($path);
+ * @brief When a file is renamed, rename its keyfile also
+ * @param $path
+ * @return bool Result of rename()
+ * @note This is pre rather than post because using post didn't work
+ */
+ public function postWrite($path)
+ {
+ $this->handleFile($path);
- return true;
- }
+ return true;
+ }
+
+ /**
+ * @param $path
+ * @return bool
+ */
+ public function postTouch($path)
+ {
+ $this->handleFile($path);
- public function postTouch( $path )
- {
- $this->handleFile($path);
+ return true;
+ }
- return true;
- }
+ /**
+ * @param $path
+ * @param $result
+ * @return resource
+ */
+ public function postFopen($path, &$result)
+ {
- public function postFopen( $path, &$result ){
+ if (!$result) {
- if ( !$result ) {
-
return $result;
-
+
}
- // Reformat path for use with OC_FSV
- $path_split = explode( '/', $path );
- $path_f = implode( '/', array_slice( $path_split, 3 ) );
+ // Reformat path for use with OC_FSV
+ $path_split = explode('/', $path);
+ $path_f = implode('/', array_slice($path_split, 3));
- // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
- if($path_split[2] == 'cache') {
- return $result;
- }
+ // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+ if ($path_split[2] == 'cache') {
+ return $result;
+ }
// Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $meta = stream_get_meta_data( $result );
-
- $view = new \OC_FilesystemView( '' );
-
- $util = new Util( $view, \OCP\USER::getUser());
-
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $meta = stream_get_meta_data($result);
+
+ $view = new \OC_FilesystemView('');
+
+ $util = new Util($view, \OCP\USER::getUser());
+
// If file is already encrypted, decrypt using crypto protocol
- if (
- Crypt::mode() == 'server'
- && $util->isEncryptedPath( $path )
+ if (
+ Crypt::mode() == 'server'
+ && $util->isEncryptedPath($path)
) {
-
+
// Close the original encrypted file
- fclose( $result );
-
+ fclose($result);
+
// Open the file using the crypto stream wrapper
// protocol and let it do the decryption work instead
- $result = fopen( 'crypt://' . $path_f, $meta['mode'] );
-
-
- } elseif (
- self::shouldEncrypt( $path )
- and $meta ['mode'] != 'r'
- and $meta['mode'] != 'rb'
+ $result = fopen('crypt://' . $path_f, $meta['mode']);
+
+
+ } elseif (
+ self::shouldEncrypt($path)
+ and $meta ['mode'] != 'r'
+ and $meta['mode'] != 'rb'
) {
- // If the file is not yet encrypted, but should be
- // encrypted when it's saved (it's not read only)
-
- // NOTE: this is the case for new files saved via WebDAV
-
-// if (
-// $view->file_exists( $path )
-// and $view->filesize( $path ) > 0
-// ) {
-// $x = $view->file_get_contents( $path );
-//
-// $tmp = tmpfile();
-
-// // Make a temporary copy of the original file
-// \OCP\Files::streamCopy( $result, $tmp );
-//
-// // Close the original stream, we'll return another one
-// fclose( $result );
-//
-// $view->file_put_contents( $path_f, $tmp );
-//
-// fclose( $tmp );
-
-// }
-
- $result = fopen( 'crypt://'.$path_f, $meta['mode'] );
-
+ $result = fopen('crypt://' . $path_f, $meta['mode']);
}
-
+
// Re-enable the proxy
\OC_FileProxy::$enabled = $proxyStatus;
-
+
return $result;
-
+
}
- public function postGetMimeType( $path, $mime ) {
+ /**
+ * @param $path
+ * @param $mime
+ * @return string
+ */
+ public function postGetMimeType($path, $mime)
+ {
+
+ if (Crypt::isCatfileContent($path)) {
+
+ $mime = \OCP\Files::getMimeType('crypt://' . $path, 'w');
- if ( Crypt::isCatfileContent( $path ) ) {
-
- $mime = \OCP\Files::getMimeType( 'crypt://' . $path, 'w' );
-
}
-
+
return $mime;
-
- }
- public function postGetFileInfo( $path, $data ) {
+ }
- // if path is a folder do nothing
- if(is_array($data) && array_key_exists('size', $data)) {
+ /**
+ * @param $path
+ * @param $data
+ * @return array
+ */
+ public function postGetFileInfo($path, $data)
+ {
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // if path is a folder do nothing
+ if (is_array($data) && array_key_exists('size', $data)) {
- // get file size
- $data['size'] = self::postFileSize($path, $data['size']);
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // Re-enable the proxy
- \OC_FileProxy::$enabled = $proxyStatus;
- }
+ // get file size
+ $data['size'] = self::postFileSize($path, $data['size']);
- return $data;
- }
+ // Re-enable the proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
- public function postStat($path, $data)
- {
- // check if file is encrypted
- if (Crypt::isCatfileContent($path)) {
+ return $data;
+ }
- // get file info from cache
- $cached = \OC\Files\Filesystem::getFileInfo($path, '');
+ /**
+ * @param $path
+ * @param $data
+ * @return mixed
+ */
+ public function postStat($path, $data)
+ {
+ // check if file is encrypted
+ if (Crypt::isCatfileContent($path)) {
- // set the real file size
- $data['size'] = $cached['unencrypted_size'];
- }
+ // get file info from cache
+ $cached = \OC\Files\Filesystem::getFileInfo($path, '');
- return $data;
- }
+ // set the real file size
+ $data['size'] = $cached['unencrypted_size'];
+ }
- public function postFileSize($path, $size)
- {
+ return $data;
+ }
- $view = new \OC_FilesystemView('/');
+ /**
+ * @param $path
+ * @param $size
+ * @return bool
+ */
+ public function postFileSize($path, $size)
+ {
- // if path is a folder do nothing
- if ($view->is_dir($path)) {
- return $size;
- }
+ $view = new \OC_FilesystemView('/');
- // Reformat path for use with OC_FSV
- $path_split = explode('/', $path);
- $path_f = implode('/', array_slice($path_split, 3));
+ // if path is a folder do nothing
+ if ($view->is_dir($path)) {
+ return $size;
+ }
- // if path is empty we cannot resolve anything
- if(empty($path_f)) {
- return $size;
- }
+ // Reformat path for use with OC_FSV
+ $path_split = explode('/', $path);
+ $path_f = implode('/', array_slice($path_split, 3));
- // get file info from database/cache
- $fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
+ // if path is empty we cannot resolve anything
+ if (empty($path_f)) {
+ return $size;
+ }
- // if file is encrypted return real file size
- if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
- $size = $fileInfo['unencrypted_size'];
- } else {
- // self healing if file was removed from file cache
- if(is_array($fileInfo)) {
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
- $fixSize = $util->getFileSize($path);
- if($fixSize > 0) {
- $size = $fixSize;
+ // get file info from database/cache
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
+
+ // if file is encrypted return real file size
+ if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+ $size = $fileInfo['unencrypted_size'];
+ } else {
+ // self healing if file was removed from file cache
+ if (is_array($fileInfo)) {
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $fixSize = $util->getFileSize($path);
+ if ($fixSize > 0) {
+ $size = $fixSize;
+
+ $fileInfo['encrypted'] = true;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info
+ $view->putFileInfo($path_f, $fileInfo);
+ }
+ }
+ }
+ return $size;
+ }
- $fileInfo['encrypted'] = true;
- $fileInfo['unencrypted_size'] = $size;
+ /**
+ * @param $path
+ */
+ public function handleFile($path)
+ {
- // put file info
- $view->putFileInfo( $path_f, $fileInfo );
- }
- }
- }
- return $size;
- }
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- public function handleFile($path) {
+ $view = new \OC_FilesystemView('/');
+ $session = new Session($view);
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Reformat path for use with OC_FSV
+ $path_split = explode('/', $path);
+ $path_f = implode('/', array_slice($path_split, 3));
- $view = new \OC_FilesystemView('/');
- $session = new Session($view);
- $userId = \OCP\User::getUser();
- $util = new Util( $view, $userId );
+ // only if file is on 'files' folder fix file size and sharing
+ if ($path_split[2] == 'files' && $util->fixFileSize($path)) {
- // Reformat path for use with OC_FSV
- $path_split = explode( '/', $path );
- $path_f = implode( '/', array_slice( $path_split, 3 ) );
+ // get sharing app state
+ $sharingEnabled = \OCP\Share::isEnabled();
- // only if file is on 'files' folder fix file size and sharing
- if($path_split[2] == 'files' && $util->fixFileSize($path)) {
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path_f);
- // get sharing app state
- $sharingEnabled = \OCP\Share::isEnabled();
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $path_f);
+ }
- // get users
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path_f);
-
- // update sharing-keys
- $util->setSharedFileKeyfiles($session, $usersSharing, $path_f);
- }
-
- \OC_FileProxy::$enabled = $proxyStatus;
- }
- }
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 8d604dc721..8425cedd99 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -26,73 +26,75 @@ namespace OCA\Encryption;
* Class for handling encryption related session data
*/
-class Session {
+class Session
+{
private $view;
-
+
/**
* @brief if session is started, check if ownCloud key pair is set up, if not create it
- *
- * The ownCloud key pair is used to allow public link sharing even if encryption is enabled
+ * @param \OC_FilesystemView $view
+ *
+ * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
*/
- public function __construct( $view ) {
-
+ public function __construct($view)
+ {
+
$this->view = $view;
+ if (!$this->view->is_dir('owncloud_private_key')) {
+
+ $this->view->mkdir('owncloud_private_key');
- if ( ! $this->view->is_dir( 'owncloud_private_key' ) ) {
-
- $this->view->mkdir( 'owncloud_private_key' );
-
}
$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
if ($publicShareKeyId === null) {
- $publicShareKeyId = 'pubShare_'.substr(md5(time()),0,8);
+ $publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
\OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
}
-
- if (
- ! $this->view->file_exists( "/public-keys/".$publicShareKeyId.".public.key" )
- || ! $this->view->file_exists( "/owncloud_private_key/".$publicShareKeyId.".private.key" )
+
+ if (
+ !$this->view->file_exists("/public-keys/" . $publicShareKeyId . ".public.key")
+ || !$this->view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".private.key")
) {
-
- $keypair = Crypt::createKeypair();
-
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- // Save public key
-
- if (!$view->is_dir('/public-keys')) {
- $view->mkdir('/public-keys');
- }
-
- $this->view->file_put_contents( '/public-keys/'.$publicShareKeyId.'.public.key', $keypair['publicKey'] );
-
- // Encrypt private key empthy passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
-
- // Save private key
- $this->view->file_put_contents( '/owncloud_private_key/'.$publicShareKeyId.'.private.key', $encryptedPrivateKey );
-
+
+ $keypair = Crypt::createKeypair();
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Save public key
+
+ if (!$view->is_dir('/public-keys')) {
+ $view->mkdir('/public-keys');
+ }
+
+ $this->view->file_put_contents('/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey']);
+
+ // Encrypt private key empthy passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '');
+
+ // Save private key
+ $this->view->file_put_contents('/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey);
+
\OC_FileProxy::$enabled = $proxyStatus;
-
+
}
- if(\OCP\USER::getUser() === false) {
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ if (\OCP\USER::getUser() === false) {
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/'.$publicShareKeyId.'.private.key' );
- $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
- $this->setPrivateKey($privateKey);
+ $encryptedKey = $this->view->file_get_contents('/owncloud_private_key/' . $publicShareKeyId . '.private.key');
+ $privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, '');
+ $this->setPrivateKey($privateKey);
- \OC_FileProxy::$enabled = $proxyStatus;
- }
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
/**
@@ -100,71 +102,72 @@ class Session {
* @param string $privateKey
* @return bool
*/
- public function setPrivateKey( $privateKey ) {
-
+ public function setPrivateKey($privateKey)
+ {
+
$_SESSION['privateKey'] = $privateKey;
-
+
return true;
-
+
}
-
+
/**
* @brief Gets user private key from session
* @returns string $privateKey The user's plaintext private key
*
*/
- public function getPrivateKey() {
-
- if (
- isset( $_SESSION['privateKey'] )
- && !empty( $_SESSION['privateKey'] )
+ public function getPrivateKey()
+ {
+
+ if (
+ isset($_SESSION['privateKey'])
+ && !empty($_SESSION['privateKey'])
) {
-
+
return $_SESSION['privateKey'];
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief Sets user legacy key to session
+ * @param $legacyKey
* @return bool
- *
*/
- public function setLegacyKey( $legacyKey ) {
-
- if ( $_SESSION['legacyKey'] = $legacyKey ) {
-
- return true;
-
- }
-
+ public function setLegacyKey($legacyKey)
+ {
+
+ $_SESSION['legacyKey'] = $legacyKey;
+
+ return true;
}
-
+
/**
* @brief Gets user legacy key from session
* @returns string $legacyKey The user's plaintext legacy key
*
*/
- public function getLegacyKey() {
-
- if (
- isset( $_SESSION['legacyKey'] )
- && !empty( $_SESSION['legacyKey'] )
+ public function getLegacyKey()
+ {
+
+ if (
+ isset($_SESSION['legacyKey'])
+ && !empty($_SESSION['legacyKey'])
) {
-
+
return $_SESSION['legacyKey'];
-
+
} else {
-
+
return false;
-
+
}
-
+
}
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index ab96783508..31546a2cc5 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -3,7 +3,7 @@
* ownCloud
*
* @author Robin Appelman
- * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
* <icewind1991@gmail.com>
*
* This library is free software; you can redistribute it and/or
@@ -32,30 +32,31 @@ namespace OCA\Encryption;
/**
* @brief Provides 'crypt://' stream wrapper protocol.
- * @note We use a stream wrapper because it is the most secure way to handle
+ * @note We use a stream wrapper because it is the most secure way to handle
* decrypted content transfers. There is no safe way to decrypt the entire file
* somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
* @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
- * crypt://filename, or crypt://subdirectory/filename, NOT
- * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
- * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
+ * crypt://filename, or crypt://subdirectory/filename, NOT
+ * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
+ * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
* will not be accessible to other methods.
- * @note Data read and written must always be 8192 bytes long, as this is the
- * buffer size used internally by PHP. The encryption process makes the input
- * data longer, and input is chunked into smaller pieces in order to result in
+ * @note Data read and written must always be 8192 bytes long, as this is the
+ * buffer size used internally by PHP. The encryption process makes the input
+ * data longer, and input is chunked into smaller pieces in order to result in
* a 8192 encrypted block size.
- * @note When files are deleted via webdav, or when they are updated and the
- * previous version deleted, this is handled by OC\Files\View, and thus the
+ * @note When files are deleted via webdav, or when they are updated and the
+ * previous version deleted, this is handled by OC\Files\View, and thus the
* encryption proxies are used and keyfiles deleted.
*/
-class Stream {
+class Stream
+{
public static $sourceStreams = array();
+ private $plainKey;
+ private $encKeyfiles;
- // TODO: make all below properties private again once unit testing is
- // configured correctly
- public $rawPath; // The raw path relative to the data dir
- public $relPath; // rel path to users file dir
+ private $rawPath; // The raw path relative to the data dir
+ private $relPath; // rel path to users file dir
private $userId;
private $handle; // Resource returned by fopen
private $path;
@@ -63,226 +64,238 @@ class Stream {
private $meta = array(); // Header / meta for source stream
private $count;
private $writeCache;
- public $size;
- public $unencryptedSize;
+ private $size;
+ private $unencryptedSize;
private $publicKey;
private $keyfile;
private $encKeyfile;
private static $view; // a fsview object set to user dir
private $rootView; // a fsview object set to '/'
- public function stream_open( $path, $mode, $options, &$opened_path ) {
+ /**
+ * @param $path
+ * @param $mode
+ * @param $options
+ * @param $opened_path
+ * @return bool
+ */
+ public function stream_open($path, $mode, $options, &$opened_path)
+ {
- if ( ! isset( $this->rootView ) ) {
- $this->rootView = new \OC_FilesystemView( '/' );
+ if (!isset($this->rootView)) {
+ $this->rootView = new \OC_FilesystemView('/');
}
- $util = new Util( $this->rootView, \OCP\USER::getUser());
+ $util = new Util($this->rootView, \OCP\USER::getUser());
- $this->userId = $util->getUserId();
+ $this->userId = $util->getUserId();
+
+ // Strip identifier text from path, this gives us the path relative to data/<user>/files
+ $this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
- // Strip identifier text from path, this gives us the path relative to data/<user>/files
- $this->relPath = \OC\Files\Filesystem::normalizePath(str_replace( 'crypt://', '', $path ));
-
// rawPath is relative to the data directory
$this->rawPath = $util->getUserFilesDir() . $this->relPath;
-
+
if (
- dirname( $this->rawPath ) == 'streams'
- and isset( self::$sourceStreams[basename( $this->rawPath )] )
+ dirname($this->rawPath) == 'streams'
+ and isset(self::$sourceStreams[basename($this->rawPath)])
) {
-
+
// Is this just for unit testing purposes?
- $this->handle = self::$sourceStreams[basename( $this->rawPath )]['stream'];
+ $this->handle = self::$sourceStreams[basename($this->rawPath)]['stream'];
- $this->path = self::$sourceStreams[basename( $this->rawPath )]['path'];
+ $this->path = self::$sourceStreams[basename($this->rawPath)]['path'];
- $this->size = self::$sourceStreams[basename( $this->rawPath )]['size'];
+ $this->size = self::$sourceStreams[basename($this->rawPath)]['size'];
} else {
- // Disable fileproxies so we can get the file size and open the source file without recursive encryption
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable fileproxies so we can get the file size and open the source file without recursive encryption
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- if (
- $mode == 'w'
- or $mode == 'w+'
- or $mode == 'wb'
- or $mode == 'wb+'
+ if (
+ $mode == 'w'
+ or $mode == 'w+'
+ or $mode == 'wb'
+ or $mode == 'wb+'
) {
// We're writing a new file so start write counter with 0 bytes
$this->size = 0;
- $this->unencryptedSize = 0;
+ $this->unencryptedSize = 0;
} else {
-
- $this->size = $this->rootView->filesize( $this->rawPath, $mode );
-
- //$this->size = filesize( $this->rawPath );
-
+
+ $this->size = $this->rootView->filesize($this->rawPath, $mode);
+
}
- //$this->handle = fopen( $this->rawPath, $mode );
-
- $this->handle = $this->rootView->fopen( $this->rawPath, $mode );
-
+ $this->handle = $this->rootView->fopen($this->rawPath, $mode);
+
\OC_FileProxy::$enabled = $proxyStatus;
- if ( ! is_resource( $this->handle ) ) {
+ if (!is_resource($this->handle)) {
- \OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR );
+ \OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
} else {
-
- $this->meta = stream_get_meta_data( $this->handle );
-
+
+ $this->meta = stream_get_meta_data($this->handle);
+
}
}
- return is_resource( $this->handle );
+ return is_resource($this->handle);
}
-
- public function stream_seek( $offset, $whence = SEEK_SET ) {
-
+
+ /**
+ * @param $offset
+ * @param int $whence
+ */
+ public function stream_seek($offset, $whence = SEEK_SET)
+ {
+
$this->flush();
-
- fseek( $this->handle, $offset, $whence );
-
+
+ fseek($this->handle, $offset, $whence);
+
}
-
- public function stream_tell() {
+
+ /**
+ * @return int
+ */
+ public function stream_tell()
+ {
return ftell($this->handle);
}
-
- public function stream_read( $count ) {
-
+
+ /**
+ * @param $count
+ * @return bool|string
+ * @throws \Exception
+ */
+ public function stream_read($count)
+ {
+
$this->writeCache = '';
- if ( $count != 8192 ) {
-
+ if ($count != 8192) {
+
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
- \OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
+ \OCP\Util::writeLog('files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
die();
}
-// $pos = ftell( $this->handle );
-//
// Get the data from the file handle
- $data = fread( $this->handle, 8192 );
-
+ $data = fread($this->handle, 8192);
+
$result = '';
-
- if ( strlen( $data ) ) {
-
- if ( ! $this->getKey() ) {
-
+
+ if (strlen($data)) {
+
+ if (!$this->getKey()) {
+
// Error! We don't have a key to decrypt the file with
- throw new \Exception( 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream' );
-
+ throw new \Exception('Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
+
}
-
+
// Decrypt data
- $result = Crypt::symmetricDecryptFileContent( $data, $this->plainKey );
-
- }
+ $result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
-// $length = $this->size - $pos;
-//
-// if ( $length < 8192 ) {
-//
-// $result = substr( $result, 0, $length );
-//
-// }
+ }
return $result;
}
-
+
/**
* @brief Encrypt and pad data ready for writing to disk
* @param string $plainData data to be encrypted
* @param string $key key to use for encryption
- * @return encrypted data on success, false on failure
+ * @return string encrypted data on success, false on failure
*/
- public function preWriteEncrypt( $plainData, $key ) {
-
+ public function preWriteEncrypt($plainData, $key)
+ {
+
// Encrypt data to 'catfile', which includes IV
- if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
-
- return $encrypted;
-
+ if ($encrypted = Crypt::symmetricEncryptFileContent($plainData, $key)) {
+
+ return $encrypted;
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief Fetch the plain encryption key for the file and set it as plainKey property
- * @param bool $generate if true, a new key will be generated if none can be found
+ * @internal param bool $generate if true, a new key will be generated if none can be found
* @return bool true on key found and set, false on key not found and new key generated and set
*/
- public function getKey() {
-
+ public function getKey()
+ {
+
// Check if key is already set
- if ( isset( $this->plainKey ) && isset( $this->encKeyfile ) ) {
-
+ if (isset($this->plainKey) && isset($this->encKeyfile)) {
+
return true;
-
+
}
-
+
// Fetch and decrypt keyfile
- // Fetch existing keyfile
- $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
+ // Fetch existing keyfile
+ $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->userId, $this->relPath);
// If a keyfile already exists
- if ( $this->encKeyfile ) {
+ if ($this->encKeyfile) {
$this->setUserProperty();
-
- $session = new Session( $this->rootView );
-
- $privateKey = $session->getPrivateKey( $this->userId );
-
- $shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
-
- $this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
-
+
+ $session = new Session($this->rootView);
+
+ $privateKey = $session->getPrivateKey($this->userId);
+
+ $shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+
+ $this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $privateKey);
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
- public function setUserProperty() {
-
+
+ public function setUserProperty()
+ {
+
// Only get the user again if it isn't already set
- if ( empty( $this->userId ) ) {
-
+ if (empty($this->userId)) {
+
// TODO: Move this user call out of here - it belongs
// elsewhere
$this->userId = \OCP\User::getUser();
-
+
}
-
+
// TODO: Add a method for getting the user in case OCP\User::
// getUser() doesn't work (can that scenario ever occur?)
-
+
}
-
+
/**
* @brief Handle plain data from the stream, and write it in 8192 byte blocks
* @param string $data data to be written to disk
@@ -292,89 +305,64 @@ class Stream {
* @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
* @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
*/
- public function stream_write( $data ) {
-
+ public function stream_write($data)
+ {
+
// Disable the file proxies so that encryption is not
// automatically attempted when the file is written to disk -
// we are handling that separately here and we don't want to
// get into an infinite loop
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
-
+
// Get the length of the unencrypted data that we are handling
- $length = strlen( $data );
-
+ $length = strlen($data);
+
// So far this round, no data has been written
$written = 0;
-
+
// Find out where we are up to in the writing of data to the
// file
- $pointer = ftell( $this->handle );
-
+ $pointer = ftell($this->handle);
+
// Make sure the userId is set
$this->setUserProperty();
-
+
// Get / generate the keyfile for the file we're handling
// If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
- if ( ! $this->getKey() ) {
-
+ if (!$this->getKey()) {
+
$this->plainKey = Crypt::generateKey();
-
+
}
-
-
+
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
- if ( $this->writeCache ) {
-
+ if ($this->writeCache) {
+
// Concat writeCache to start of $data
$data = $this->writeCache . $data;
-
+
// Clear the write cache, ready for resuse - it has been
// flushed and its old contents processed
$this->writeCache = '';
}
-//
-// // Make sure we always start on a block start
- if ( 0 != ( $pointer % 8192 ) ) {
- // if the current position of
- // file indicator is not aligned to a 8192 byte block, fix it
- // so that it is
-
-// fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
-//
-// $pointer = ftell( $this->handle );
-//
-// $unencryptedNewBlock = fread( $this->handle, 8192 );
-//
-// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-//
-// $block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->plainKey );
-//
-// $x = substr( $block, 0, $currentPos % 8192 );
-//
-// $data = $x . $data;
-//
-// fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-//
- }
-// $currentPos = ftell( $this->handle );
-
-// // While there still remains somed data to be processed & written
- while( strlen( $data ) > 0 ) {
-
-// // Remaining length for this iteration, not of the
-// // entire file (may be greater than 8192 bytes)
-// $remainingLength = strlen( $data );
-//
-// // If data remaining to be written is less than the
-// // size of 1 6126 byte block
- if ( strlen( $data ) < 6126 ) {
-
+
+ // While there still remains somed data to be processed & written
+ while (strlen($data) > 0) {
+
+ // Remaining length for this iteration, not of the
+ // entire file (may be greater than 8192 bytes)
+ $remainingLength = strlen( $data );
+
+ // If data remaining to be written is less than the
+ // size of 1 6126 byte block
+ if (strlen($data) < 6126) {
+
// Set writeCache to contents of $data
// The writeCache will be carried over to the
// next write round, and added to the start of
@@ -387,148 +375,174 @@ class Stream {
// Clear $data ready for next round
$data = '';
-
+
} else {
-
+
// Read the chunk from the start of $data
- $chunk = substr( $data, 0, 6126 );
-
- $encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
-
+ $chunk = substr($data, 0, 6126);
+
+ $encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
+
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
- fwrite( $this->handle, $encrypted );
-
- $writtenLen = strlen( $encrypted );
- //fseek( $this->handle, $writtenLen, SEEK_CUR );
+ fwrite($this->handle, $encrypted);
+
+ $writtenLen = strlen($encrypted);
// Remove the chunk we just processed from
// $data, leaving only unprocessed data in $data
// var, for handling on the next round
- $data = substr( $data, 6126 );
+ $data = substr($data, 6126);
}
-
+
}
-
- $this->size = max( $this->size, $pointer + $length );
- $this->unencryptedSize += $length;
- \OC_FileProxy::$enabled = $proxyStatus;
+ $this->size = max($this->size, $pointer + $length);
+ $this->unencryptedSize += $length;
+
+ \OC_FileProxy::$enabled = $proxyStatus;
return $length;
}
- public function stream_set_option( $option, $arg1, $arg2 ) {
- switch($option) {
+ /**
+ * @param $option
+ * @param $arg1
+ * @param $arg2
+ */
+ public function stream_set_option($option, $arg1, $arg2)
+ {
+ switch ($option) {
case STREAM_OPTION_BLOCKING:
- stream_set_blocking( $this->handle, $arg1 );
+ stream_set_blocking($this->handle, $arg1);
break;
case STREAM_OPTION_READ_TIMEOUT:
- stream_set_timeout( $this->handle, $arg1, $arg2 );
+ stream_set_timeout($this->handle, $arg1, $arg2);
break;
case STREAM_OPTION_WRITE_BUFFER:
- stream_set_write_buffer( $this->handle, $arg1, $arg2 );
+ stream_set_write_buffer($this->handle, $arg1, $arg2);
}
}
- public function stream_stat() {
+ /**
+ * @return array
+ */
+ public function stream_stat()
+ {
return fstat($this->handle);
}
-
- public function stream_lock( $mode ) {
- flock( $this->handle, $mode );
+
+ /**
+ * @param $mode
+ */
+ public function stream_lock($mode)
+ {
+ flock($this->handle, $mode);
}
-
- public function stream_flush() {
-
- return fflush( $this->handle );
+
+ /**
+ * @return bool
+ */
+ public function stream_flush()
+ {
+
+ return fflush($this->handle);
// Not a typo: http://php.net/manual/en/function.fflush.php
-
+
}
- public function stream_eof() {
+ /**
+ * @return bool
+ */
+ public function stream_eof()
+ {
return feof($this->handle);
}
- private function flush() {
-
- if ( $this->writeCache ) {
-
+ private function flush()
+ {
+
+ if ($this->writeCache) {
+
// Set keyfile property for file in question
$this->getKey();
-
- $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->plainKey );
-
- fwrite( $this->handle, $encrypted );
-
+
+ $encrypted = $this->preWriteEncrypt($this->writeCache, $this->plainKey);
+
+ fwrite($this->handle, $encrypted);
+
$this->writeCache = '';
-
+
}
-
+
}
- public function stream_close() {
+ /**
+ * @return bool
+ */
+ public function stream_close()
+ {
+
+ $this->flush();
- $this->flush();
-
- if (
- $this->meta['mode']!='r'
- and $this->meta['mode']!='rb'
- and $this->size > 0
+ if (
+ $this->meta['mode'] != 'r'
+ and $this->meta['mode'] != 'rb'
+ and $this->size > 0
) {
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // Fetch user's public key
- $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+ // Fetch user's public key
+ $this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
- // Check if OC sharing api is enabled
- $sharingEnabled = \OCP\Share::isEnabled();
+ // Check if OC sharing api is enabled
+ $sharingEnabled = \OCP\Share::isEnabled();
- $util = new Util( $this->rootView, $this->userId );
+ $util = new Util($this->rootView, $this->userId);
- // Get all users sharing the file includes current user
- $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId);
+ // Get all users sharing the file includes current user
+ $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
- // Fetch public keys for all sharing users
- $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+ // Fetch public keys for all sharing users
+ $publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
- // Encrypt enc key for all sharing users
- $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
+ // Encrypt enc key for all sharing users
+ $this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
- $view = new \OC_FilesystemView( '/' );
+ $view = new \OC_FilesystemView('/');
- // Save the new encrypted file key
- Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
+ // Save the new encrypted file key
+ Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
- // Save the sharekeys
- Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+ // Save the sharekeys
+ Keymanager::setShareKeys($view, $this->relPath, $this->encKeyfiles['keys']);
- // get file info
- $fileInfo = $view->getFileInfo($this->rawPath);
- if(!is_array($fileInfo)) {
- $fileInfo = array();
- }
+ // get file info
+ $fileInfo = $view->getFileInfo($this->rawPath);
+ if (!is_array($fileInfo)) {
+ $fileInfo = array();
+ }
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
- // set encryption data
- $fileInfo['encrypted'] = true;
- $fileInfo['size'] = $this->size;
- $fileInfo['unencrypted_size'] = $this->unencryptedSize;
+ // set encryption data
+ $fileInfo['encrypted'] = true;
+ $fileInfo['size'] = $this->size;
+ $fileInfo['unencrypted_size'] = $this->unencryptedSize;
- // set fileinfo
- $view->putFileInfo( $this->rawPath, $fileInfo);
+ // set fileinfo
+ $view->putFileInfo($this->rawPath, $fileInfo);
}
- return fclose( $this->handle );
-
+ return fclose($this->handle);
+
}
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 82f789c520..9ba7b3b3a3 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -3,7 +3,7 @@
* ownCloud
*
* @author Sam Tuke, Frank Karlitschek
- * @copyright 2012 Sam Tuke <samtuke@owncloud.com>,
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>,
* Frank Karlitschek <frank@owncloud.org>
*
* This library is free software; you can redistribute it and/or
@@ -55,49 +55,49 @@ namespace OCA\Encryption;
* unused, likely to become obsolete shortly
*/
-class Util {
-
-
+class Util
+{
+
// Web UI:
-
+
//// DONE: files created via web ui are encrypted
//// DONE: file created & encrypted via web ui are readable in web ui
//// DONE: file created & encrypted via web ui are readable via webdav
-
-
+
+
// WebDAV:
-
+
//// DONE: new data filled files added via webdav get encrypted
//// DONE: new data filled files added via webdav are readable via webdav
//// DONE: reading unencrypted files when encryption is enabled works via
//// webdav
//// DONE: files created & encrypted via web ui are readable via webdav
-
-
+
+
// Legacy support:
-
+
//// DONE: add method to check if file is encrypted using new system
//// DONE: add method to check if file is encrypted using old system
//// DONE: add method to fetch legacy key
//// DONE: add method to decrypt legacy encrypted data
-
-
+
+
// Admin UI:
-
+
//// DONE: changing user password also changes encryption passphrase
-
+
//// TODO: add support for optional recovery in case of lost passphrase / keys
//// TODO: add admin optional required long passphrase for users
//// TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
-
-
+
+
// Integration testing:
-
+
//// TODO: test new encryption with versioning
//// DONE: test new encryption with sharing
//// TODO: test new encryption with proxies
-
-
+
+
private $view; // OC_FilesystemView object for filesystem operations
private $userId; // ID of the currently logged-in user
private $pwd; // User Password
@@ -110,228 +110,246 @@ class Util {
private $privateKeyPath; // Path to user's private key
private $publicShareKeyId;
private $recoveryKeyId;
- private $isPublic;
+ private $isPublic;
- public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
+ /**
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @param bool $client
+ */
+ public function __construct(\OC_FilesystemView $view, $userId, $client = false)
+ {
$this->view = $view;
$this->userId = $userId;
$this->client = $client;
- $this->isPublic = false;
-
- $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
- $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
-
- // if we are anonymous/public
- if($this->userId === false) {
- $this->userId = $this->publicShareKeyId;
-
- // only handle for files_sharing app
- if($GLOBALS['app'] === 'files_sharing') {
- $this->userDir = '/' . $GLOBALS['fileOwner'];
- $this->fileFolderName = 'files';
- $this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
- $this->isPublic = true;
- }
-
- } else {
- $this->userDir = '/' . $this->userId;
- $this->fileFolderName = 'files';
- $this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
- $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
- $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
- $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
- $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
- }
+ $this->isPublic = false;
+
+ $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+ $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+ // if we are anonymous/public
+ if ($this->userId === false) {
+ $this->userId = $this->publicShareKeyId;
+
+ // only handle for files_sharing app
+ if ($GLOBALS['app'] === 'files_sharing') {
+ $this->userDir = '/' . $GLOBALS['fileOwner'];
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ $this->isPublic = true;
+ }
+
+ } else {
+ $this->userDir = '/' . $this->userId;
+ $this->fileFolderName = 'files';
+ $this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+ $this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+ $this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+ $this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+ $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+ }
}
-
- public function ready() {
-
- if(
- ! $this->view->file_exists( $this->encryptionDir )
- or ! $this->view->file_exists( $this->keyfilesPath )
- or ! $this->view->file_exists( $this->shareKeysPath )
- or ! $this->view->file_exists( $this->publicKeyPath )
- or ! $this->view->file_exists( $this->privateKeyPath )
+
+ /**
+ * @return bool
+ */
+ public function ready()
+ {
+
+ if (
+ !$this->view->file_exists($this->encryptionDir)
+ or !$this->view->file_exists($this->keyfilesPath)
+ or !$this->view->file_exists($this->shareKeysPath)
+ or !$this->view->file_exists($this->publicKeyPath)
+ or !$this->view->file_exists($this->privateKeyPath)
) {
-
+
return false;
-
+
} else {
-
+
return true;
-
+
}
-
+
}
-
- /**
- * @brief Sets up user folders and keys for serverside encryption
- * @param $passphrase passphrase to encrypt server-stored private key with
- */
- public function setupServerSide( $passphrase = null ) {
-
+
+ /**
+ * @brief Sets up user folders and keys for serverside encryption
+ * @param string $passphrase passphrase to encrypt server-stored private key with
+ */
+ public function setupServerSide($passphrase = null)
+ {
+
// Set directories to check / create
- $setUpDirs = array(
+ $setUpDirs = array(
$this->userDir
- , $this->userFilesDir
- , $this->publicKeyDir
- , $this->encryptionDir
- , $this->keyfilesPath
- , $this->shareKeysPath
+ , $this->userFilesDir
+ , $this->publicKeyDir
+ , $this->encryptionDir
+ , $this->keyfilesPath
+ , $this->shareKeysPath
);
-
+
// Check / create all necessary dirs
- foreach ( $setUpDirs as $dirPath ) {
-
- if( !$this->view->file_exists( $dirPath ) ) {
-
- $this->view->mkdir( $dirPath );
-
+ foreach ($setUpDirs as $dirPath) {
+
+ if (!$this->view->file_exists($dirPath)) {
+
+ $this->view->mkdir($dirPath);
+
}
-
+
}
-
+
// Create user keypair
- if (
- ! $this->view->file_exists( $this->publicKeyPath )
- or ! $this->view->file_exists( $this->privateKeyPath )
+ if (
+ !$this->view->file_exists($this->publicKeyPath)
+ or !$this->view->file_exists($this->privateKeyPath)
) {
-
+
// Generate keypair
$keypair = Crypt::createKeypair();
-
+
\OC_FileProxy::$enabled = false;
-
+
// Save public key
- $this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
-
+ $this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+
// Encrypt private key with user pwd as passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
-
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+
// Save private key
- $this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
-
+ $this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+
\OC_FileProxy::$enabled = true;
-
+
}
-
+
// If there's no record for this user's encryption preferences
- if ( false === $this->recoveryEnabledForUser() ) {
-
+ if (false === $this->recoveryEnabledForUser()) {
+
// create database configuration
$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
- $args = array( $this->userId, 'server-side', 0);
- $query = \OCP\DB::prepare( $sql );
- $query->execute( $args );
-
+ $args = array($this->userId, 'server-side', 0);
+ $query = \OCP\DB::prepare($sql);
+ $query->execute($args);
+
}
-
+
return true;
-
+
}
- public function getPublicShareKeyId() {
+ /**
+ * @return string
+ */
+ public function getPublicShareKeyId()
+ {
return $this->publicShareKeyId;
}
-
+
/**
* @brief Check whether pwd recovery is enabled for a given user
- * @return 1 = yes, 0 = no, false = no record
- * @note If records are not being returned, check for a hidden space
+ * @return bool 1 = yes, 0 = no, false = no record
+ *
+ * @note If records are not being returned, check for a hidden space
* at the start of the uid in db
*/
- public function recoveryEnabledForUser() {
-
+ public function recoveryEnabledForUser()
+ {
+
$sql = 'SELECT
recovery_enabled
FROM
`*PREFIX*encryption`
WHERE
uid = ?';
-
- $args = array( $this->userId );
- $query = \OCP\DB::prepare( $sql );
-
- $result = $query->execute( $args );
-
+ $args = array($this->userId);
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute($args);
+
$recoveryEnabled = array();
-
- while( $row = $result->fetchRow() ) {
-
+
+ while ($row = $result->fetchRow()) {
+
$recoveryEnabled[] = $row['recovery_enabled'];
-
+
}
-
+
// If no record is found
- if ( empty( $recoveryEnabled ) ) {
-
+ if (empty($recoveryEnabled)) {
+
return false;
-
- // If a record is found
+
+ // If a record is found
} else {
-
+
return $recoveryEnabled[0];
-
+
}
-
+
}
-
+
/**
* @brief Enable / disable pwd recovery for a given user
* @param bool $enabled Whether to enable or disable recovery
* @return bool
*/
- public function setRecoveryForUser( $enabled ) {
-
+ public function setRecoveryForUser($enabled)
+ {
+
$recoveryStatus = $this->recoveryEnabledForUser();
-
+
// If a record for this user already exists, update it
- if ( false === $recoveryStatus ) {
-
+ if (false === $recoveryStatus) {
+
$sql = 'INSERT INTO `*PREFIX*encryption`
(`uid`,`mode`,`recovery_enabled`)
VALUES (?,?,?)';
-
- $args = array( $this->userId, 'server-side', $enabled );
-
- // Create a new record instead
+
+ $args = array($this->userId, 'server-side', $enabled);
+
+ // Create a new record instead
} else {
-
+
$sql = 'UPDATE
*PREFIX*encryption
SET
recovery_enabled = ?
WHERE
uid = ?';
-
- $args = array( $enabled, $this->userId );
-
+
+ $args = array($enabled, $this->userId);
+
}
-
- $query = \OCP\DB::prepare( $sql );
-
- if ( $query->execute( $args ) ) {
-
+
+ $query = \OCP\DB::prepare($sql);
+
+ if ($query->execute($args)) {
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief Find all files and their encryption status within a directory
* @param string $directory The path of the parent directory to search
@@ -339,45 +357,46 @@ class Util {
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
- public function findEncFiles( $directory ) {
-
+ public function findEncFiles($directory)
+ {
+
// Disable proxy - we don't want files to be decrypted before
// we handle them
\OC_FileProxy::$enabled = false;
-
- $found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
-
- if (
- $this->view->is_dir( $directory )
- && $handle = $this->view->opendir( $directory )
+
+ $found = array('plain' => array(), 'encrypted' => array(), 'legacy' => array());
+
+ if (
+ $this->view->is_dir($directory)
+ && $handle = $this->view->opendir($directory)
) {
-
- while ( false !== ( $file = readdir( $handle ) ) ) {
-
+
+ while (false !== ($file = readdir($handle))) {
+
if (
- $file != "."
- && $file != ".."
+ $file != "."
+ && $file != ".."
) {
-
- $filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
- $relPath = $this->stripUserFilesPath( $filePath );
-
+
+ $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+ $relPath = $this->stripUserFilesPath($filePath);
+
// If the path is a directory, search
// its contents
- if ( $this->view->is_dir( $filePath ) ) {
-
- $this->findEncFiles( $filePath );
-
- // If the path is a file, determine
- // its encryption status
- } elseif ( $this->view->is_file( $filePath ) ) {
-
+ if ($this->view->is_dir($filePath)) {
+
+ $this->findEncFiles($filePath);
+
+ // If the path is a file, determine
+ // its encryption status
+ } elseif ($this->view->is_file($filePath)) {
+
// Disable proxies again, some-
// where they got re-enabled :/
\OC_FileProxy::$enabled = false;
-
- $data = $this->view->file_get_contents( $filePath );
-
+
+ $data = $this->view->file_get_contents($filePath);
+
// If the file is encrypted
// NOTE: If the userId is
// empty or not set, file will
@@ -385,128 +404,131 @@ class Util {
// NOTE: This is inefficient;
// scanning every file like this
// will eat server resources :(
- if (
- Keymanager::getFileKey( $this->view, $this->userId, $relPath )
- && Crypt::isCatfileContent( $data )
+ if (
+ Keymanager::getFileKey($this->view, $this->userId, $relPath)
+ && Crypt::isCatfileContent($data)
) {
-
- $found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
-
- // If the file uses old
- // encryption system
- } elseif ( Crypt::isLegacyEncryptedContent( $this->tail( $filePath, 3 ), $relPath ) ) {
-
- $found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
-
- // If the file is not encrypted
+
+ $found['encrypted'][] = array('name' => $file, 'path' => $filePath);
+
+ // If the file uses old
+ // encryption system
+ } elseif (Crypt::isLegacyEncryptedContent($this->tail($filePath, 3), $relPath)) {
+
+ $found['legacy'][] = array('name' => $file, 'path' => $filePath);
+
+ // If the file is not encrypted
} else {
-
- $found['plain'][] = array( 'name' => $file, 'path' => $relPath );
-
+
+ $found['plain'][] = array('name' => $file, 'path' => $relPath);
+
}
-
+
}
-
+
}
-
+
}
-
+
\OC_FileProxy::$enabled = true;
-
- if ( empty( $found ) ) {
-
+
+ if (empty($found)) {
+
return false;
-
+
} else {
-
+
return $found;
-
+
}
-
+
}
-
+
\OC_FileProxy::$enabled = true;
-
+
return false;
}
-
- /**
- * @brief Fetch the last lines of a file efficiently
- * @note Safe to use on large files; does not read entire file to memory
- * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
- */
- public function tail( $filename, $numLines ) {
-
+
+ /**
+ * @brief Fetch the last lines of a file efficiently
+ * @note Safe to use on large files; does not read entire file to memory
+ * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
+ */
+ public function tail($filename, $numLines)
+ {
+
\OC_FileProxy::$enabled = false;
-
+
$text = '';
$pos = -1;
- $handle = $this->view->fopen( $filename, 'r' );
+ $handle = $this->view->fopen($filename, 'r');
+
+ while ($numLines > 0) {
- while ( $numLines > 0 ) {
-
--$pos;
- if( fseek( $handle, $pos, SEEK_END ) !== 0 ) {
-
- rewind( $handle );
+ if (fseek($handle, $pos, SEEK_END) !== 0) {
+
+ rewind($handle);
$numLines = 0;
-
- } elseif ( fgetc( $handle ) === "\n" ) {
-
+
+ } elseif (fgetc($handle) === "\n") {
+
--$numLines;
-
+
}
- $block_size = ( -$pos ) % 8192;
- if ( $block_size === 0 || $numLines === 0 ) {
-
- $text = fread( $handle, ( $block_size === 0 ? 8192 : $block_size ) ) . $text;
-
+ $block_size = (-$pos) % 8192;
+ if ($block_size === 0 || $numLines === 0) {
+
+ $text = fread($handle, ($block_size === 0 ? 8192 : $block_size)) . $text;
+
}
}
- fclose( $handle );
-
+ fclose($handle);
+
\OC_FileProxy::$enabled = true;
-
+
return $text;
}
-
+
/**
- * @brief Check if a given path identifies an encrypted file
- * @return true / false
- */
- public function isEncryptedPath( $path ) {
-
+ * @brief Check if a given path identifies an encrypted file
+ * @param $path
+ * @return boolean
+ */
+ public function isEncryptedPath($path)
+ {
+
// Disable encryption proxy so data retrieved is in its
// original form
- $proxyStatus = \OC_FileProxy::$enabled;
+ $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- // we only need 24 byte from the last chunk
- $data = '';
- $handle = $this->view->fopen( $path, 'r' );
- if(!fseek($handle, -24, SEEK_END)) {
- $data = fgets($handle);
- }
+ // we only need 24 byte from the last chunk
+ $data = '';
+ $handle = $this->view->fopen($path, 'r');
+ if (!fseek($handle, -24, SEEK_END)) {
+ $data = fgets($handle);
+ }
- // re-enable proxy
+ // re-enable proxy
\OC_FileProxy::$enabled = $proxyStatus;
-
- return Crypt::isCatfileContent( $data );
-
+
+ return Crypt::isCatfileContent($data);
+
}
/**
- * @brief get the file size of the unencrypted file
- * @param $path absolute path
- * @return bool
- */
+ * @brief get the file size of the unencrypted file
+ * @param string $path absolute path
+ * @return bool
+ */
+ public function getFileSize($path)
+ {
- public function getFileSize( $path ) {
-
$result = 0;
// Disable encryption proxy to prevent recursive calls
@@ -514,8 +536,8 @@ class Util {
\OC_FileProxy::$enabled = false;
// Reformat path for use with OC_FSV
- $pathSplit = explode( '/', $path );
- $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
+ $pathSplit = explode('/', $path);
+ $pathRelative = implode('/', array_slice($pathSplit, 3));
if ($pathSplit[2] == 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
@@ -529,7 +551,7 @@ class Util {
// open stream
$stream = fopen('crypt://' . $pathRelative, "r");
- if(is_resource($stream)) {
+ if (is_resource($stream)) {
// calculate last chunk position
$lastChunckPos = ($lastChunckNr * 8192);
@@ -551,36 +573,36 @@ class Util {
return $result;
}
-
+
/**
* @brief fix the file size of the encrypted file
* @param $path absolute path
* @return true / false if file is encrypted
*/
+ public function fixFileSize($path)
+ {
- public function fixFileSize( $path ) {
-
$result = false;
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $realSize = $this->getFileSize( $path );
-
- if ( $realSize > 0 ) {
-
- $cached = $this->view->getFileInfo( $path );
+ $realSize = $this->getFileSize($path);
+
+ if ($realSize > 0) {
+
+ $cached = $this->view->getFileInfo($path);
$cached['encrypted'] = true;
// set the size
$cached['unencrypted_size'] = $realSize;
// put file info
- $this->view->putFileInfo( $path, $cached );
+ $this->view->putFileInfo($path, $cached);
$result = true;
-
+
}
\OC_FileProxy::$enabled = $proxyStatus;
@@ -592,70 +614,82 @@ class Util {
* @brief Format a path to be relative to the /user/files/ directory
* @note e.g. turns '/admin/files/test.txt' into 'test.txt'
*/
- public function stripUserFilesPath( $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 2 );
- $relPath = implode( '/', $sliced );
-
+ public function stripUserFilesPath($path)
+ {
+
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+ $sliced = array_slice($split, 2);
+ $relPath = implode('/', $sliced);
+
return $relPath;
-
+
}
-
+
/**
* @brief Format a path to be relative to the /user directory
* @note e.g. turns '/admin/files/test.txt' into 'files/test.txt'
*/
- public function stripFilesPath( $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 1 );
- $relPath = implode( '/', $sliced );
-
+ public function stripFilesPath($path)
+ {
+
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+ $sliced = array_slice($split, 1);
+ $relPath = implode('/', $sliced);
+
return $relPath;
-
+
}
-
+
/**
* @brief Format a shared path to be relative to the /user/files/ directory
* @note Expects a path like /uid/files/Shared/filepath
*/
- public function stripSharedFilePath( $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
- $sliced = array_slice( $split, 3 );
- $relPath = implode( '/', $sliced );
-
+ public function stripSharedFilePath($path)
+ {
+
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+ $sliced = array_slice($split, 3);
+ $relPath = implode('/', $sliced);
+
return $relPath;
-
+
}
-
- public function isSharedPath( $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $split = explode( '/', $trimmed );
-
- if ( $split[2] == "Shared" ) {
-
+
+ /**
+ * @param $path
+ * @return bool
+ */
+ public function isSharedPath($path)
+ {
+
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+
+ if ($split[2] == "Shared") {
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief Encrypt all files in a directory
* @param string $dirPath the directory whose files will be encrypted
+ * @param null $legacyPassphrase
+ * @param null $newPassphrase
+ * @return bool
* @note Encryption is recursive
*/
- public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
+ public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null)
+ {
if ($found = $this->findEncFiles($dirPath)) {
@@ -762,174 +796,180 @@ class Util {
* @param string $pathName Name of the directory to return the path of
* @return string path
*/
- public function getPath( $pathName ) {
-
- switch ( $pathName ) {
-
+ public function getPath($pathName)
+ {
+
+ switch ($pathName) {
+
case 'publicKeyDir':
-
+
return $this->publicKeyDir;
-
+
break;
-
+
case 'encryptionDir':
-
+
return $this->encryptionDir;
-
+
break;
-
+
case 'keyfilesPath':
-
+
return $this->keyfilesPath;
-
+
break;
-
+
case 'publicKeyPath':
-
+
return $this->publicKeyPath;
-
+
break;
-
+
case 'privateKeyPath':
-
+
return $this->privateKeyPath;
-
+
break;
-
+
}
-
+
}
-
+
/**
* @brief get path of a file.
- * @param $fileId id of the file
- * @return path of the file
+ * @param int $fileId id of the file
+ * @return string path of the file
*/
- public static function fileIdToPath( $fileId ) {
-
- $query = \OC_DB::prepare( 'SELECT `path`'
- .' FROM `*PREFIX*filecache`'
- .' WHERE `fileid` = ?' );
-
- $result = $query->execute( array( $fileId ) );
-
+ public static function fileIdToPath($fileId)
+ {
+
+ $query = \OC_DB::prepare('SELECT `path`'
+ . ' FROM `*PREFIX*filecache`'
+ . ' WHERE `fileid` = ?');
+
+ $result = $query->execute(array($fileId));
+
$row = $result->fetchRow();
-
- return substr( $row['path'], 5 );
-
+
+ return substr($row['path'], 5);
+
}
-
+
/**
* @brief Filter an array of UIDs to return only ones ready for sharing
* @param array $unfilteredUsers users to be checked for sharing readiness
* @return multi-dimensional array. keys: ready, unready
*/
- public function filterShareReadyUsers( $unfilteredUsers ) {
-
+ public function filterShareReadyUsers($unfilteredUsers)
+ {
+
// This array will collect the filtered IDs
$readyIds = $unreadyIds = array();
-
+
// Loop through users and create array of UIDs that need new keyfiles
- foreach ( $unfilteredUsers as $user ) {
-
- $util = new Util( $this->view, $user );
-
+ foreach ($unfilteredUsers as $user) {
+
+ $util = new Util($this->view, $user);
+
// Check that the user is encryption capable, or is the
// public system user 'ownCloud' (for public shares)
- if (
+ if (
$user == $this->publicShareKeyId
or $user == $this->recoveryKeyId
- or $util->ready()
+ or $util->ready()
) {
-
+
// Construct array of ready UIDs for Keymanager{}
$readyIds[] = $user;
-
+
} else {
-
+
// Construct array of unready UIDs for Keymanager{}
$unreadyIds[] = $user;
-
+
// Log warning; we can't do necessary setup here
// because we don't have the user passphrase
- \OC_Log::write( 'Encryption library', '"'.$user.'" is not setup for encryption', \OC_Log::WARN );
-
+ \OC_Log::write('Encryption library', '"' . $user . '" is not setup for encryption', \OC_Log::WARN);
+
}
-
+
}
-
- return array (
+
+ return array(
'ready' => $readyIds
- , 'unready' => $unreadyIds
+ , 'unready' => $unreadyIds
);
-
+
}
-
+
/**
* @brief Decrypt a keyfile without knowing how it was encrypted
* @param string $filePath
* @param string $fileOwner
* @param string $privateKey
- * @note Checks whether file was encrypted with openssl_seal or
+ * @note Checks whether file was encrypted with openssl_seal or
* openssl_encrypt, and decrypts accrdingly
- * @note This was used when 2 types of encryption for keyfiles was used,
+ * @note This was used when 2 types of encryption for keyfiles was used,
* but now we've switched to exclusively using openssl_seal()
*/
- public function decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey ) {
+ public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey)
+ {
// Get the encrypted keyfile
// NOTE: the keyfile format depends on how it was encrypted! At
// this stage we don't know how it was encrypted
- $encKeyfile = Keymanager::getFileKey( $this->view, $this->userId, $filePath );
-
+ $encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
+
// We need to decrypt the keyfile
// Has the file been shared yet?
- if (
+ if (
$this->userId == $fileOwner
- && ! Keymanager::getShareKey( $this->view, $this->userId, $filePath ) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+ && !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
) {
-
+
// The file has no shareKey, and its keyfile must be
// decrypted conventionally
- $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
-
-
+ $plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
+
+
} else {
-
+
// The file has a shareKey and must use it for decryption
- $shareKey = Keymanager::getShareKey( $this->view, $this->userId, $filePath );
-
- $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
-
+ $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
+
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
}
-
+
return $plainKeyfile;
}
-
+
/**
* @brief Encrypt keyfile to multiple users
+ * @param Session $session
* @param array $users list of users which should be able to access the file
* @param string $filePath path of the file to be shared
- * @return bool
+ * @return bool
*/
- public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
-
+ public function setSharedFileKeyfiles(Session $session, array $users, $filePath)
+ {
+
// Make sure users are capable of sharing
- $filteredUids = $this->filterShareReadyUsers( $users );
-
+ $filteredUids = $this->filterShareReadyUsers($users);
+
// If we're attempting to share to unready users
- if ( ! empty( $filteredUids['unready'] ) ) {
-
- \OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"'.print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
-
+ if (!empty($filteredUids['unready'])) {
+
+ \OC_Log::write('Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"' . print_r($filteredUids['unready'], 1), \OC_Log::WARN);
+
return false;
-
+
}
-
+
// Get public keys for each user, ready for generating sharekeys
- $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
-
+ $userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+
// Note proxy status then disable it
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -937,273 +977,279 @@ class Util {
// Get the current users's private key for decrypting existing keyfile
$privateKey = $session->getPrivateKey();
- $fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
-
+ $fileOwner = \OC\Files\Filesystem::getOwner($filePath);
+
// Decrypt keyfile
- $plainKeyfile = $this->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
-
+ $plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
+
// Re-enc keyfile to (additional) sharekeys
- $multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
-
+ $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+
// Save the recrypted key to it's owner's keyfiles directory
// Save new sharekeys to all necessary user directory
- if (
- ! Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
- || ! Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
+ if (
+ !Keymanager::setFileKey($this->view, $filePath, $fileOwner, $multiEncKey['data'])
+ || !Keymanager::setShareKeys($this->view, $filePath, $multiEncKey['keys'])
) {
- \OC_Log::write( 'Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR );
-
+ \OC_Log::write('Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR);
+
return false;
}
-
+
// Return proxy to original status
\OC_FileProxy::$enabled = $proxyStatus;
return true;
}
-
+
/**
* @brief Find, sanitise and format users sharing a file
* @note This wraps other methods into a portable bundle
*/
- public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
+ public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false)
+ {
// Check if key recovery is enabled
if (
- \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' )
+ \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
&& $this->recoveryEnabledForUser()
) {
-
+
$recoveryEnabled = true;
-
+
} else {
-
+
$recoveryEnabled = false;
-
+
}
-
+
// Make sure that a share key is generated for the owner too
- list( $owner, $ownerPath ) = $this->getUidAndFilename( $filePath );
+ list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+
+ if ($sharingEnabled) {
- if ( $sharingEnabled ) {
-
// Find out who, if anyone, is sharing the file
- $result = \OCP\Share::getUsersSharingFile( $ownerPath, $owner,true, true, true );
+ $result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true, true, true);
$userIds = $result['users'];
- if ( $result['public'] ) {
+ if ($result['public']) {
$userIds[] = $this->publicShareKeyId;
}
-
+
}
-
+
// If recovery is enabled, add the
// Admin UID to list of users to share to
- if ( $recoveryEnabled ) {
-
+ if ($recoveryEnabled) {
+
// Find recoveryAdmin user ID
- $recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
-
+ $recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
// Add recoveryAdmin to list of users sharing
$userIds[] = $recoveryKeyId;
-
+
}
// add current user if given
- if ( $currentUserId != false ) {
-
+ if ($currentUserId != false) {
+
$userIds[] = $currentUserId;
-
+
}
// Remove duplicate UIDs
- $uniqueUserIds = array_unique ( $userIds );
-
+ $uniqueUserIds = array_unique($userIds);
+
return $uniqueUserIds;
}
-
+
/**
* @brief Set file migration status for user
+ * @param $status
* @return bool
*/
- public function setMigrationStatus( $status ) {
-
+ public function setMigrationStatus($status)
+ {
+
$sql = 'UPDATE
*PREFIX*encryption
SET
migration_status = ?
WHERE
uid = ?';
-
- $args = array( $status, $this->userId );
-
- $query = \OCP\DB::prepare( $sql );
-
- if ( $query->execute( $args ) ) {
-
+
+ $args = array($status, $this->userId);
+
+ $query = \OCP\DB::prepare($sql);
+
+ if ($query->execute($args)) {
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* @brief Check whether pwd recovery is enabled for a given user
- * @return 1 = yes, 0 = no, false = no record
- * @note If records are not being returned, check for a hidden space
+ * @return bool 1 = yes, 0 = no, false = no record
+ * @note If records are not being returned, check for a hidden space
* at the start of the uid in db
*/
- public function getMigrationStatus() {
-
+ public function getMigrationStatus()
+ {
+
$sql = 'SELECT
migration_status
FROM
`*PREFIX*encryption`
WHERE
uid = ?';
-
- $args = array( $this->userId );
- $query = \OCP\DB::prepare( $sql );
-
- $result = $query->execute( $args );
-
+ $args = array($this->userId);
+
+ $query = \OCP\DB::prepare($sql);
+
+ $result = $query->execute($args);
+
$migrationStatus = array();
-
- while( $row = $result->fetchRow() ) {
-
+
+ while ($row = $result->fetchRow()) {
+
$migrationStatus[] = $row['migration_status'];
-
+
}
-
+
// If no record is found
- if ( empty( $migrationStatus ) ) {
-
+ if (empty($migrationStatus)) {
+
return false;
-
- // If a record is found
+
+ // If a record is found
} else {
-
+
return $migrationStatus[0];
-
+
}
-
+
}
-
+
/**
* @brief get uid of the owners of the file and the path to the file
- * @param $path Path of the file to check
- * @note $shareFilePath must be relative to data/UID/files. Files
+ * @param string $path Path of the file to check
+ * @note $shareFilePath must be relative to data/UID/files. Files
* relative to /Shared are also acceptable
* @return array
*/
- public function getUidAndFilename( $path ) {
+ public function getUidAndFilename($path)
+ {
+
+ $view = new \OC\Files\View($this->userFilesDir);
+ $fileOwnerUid = $view->getOwner($path);
- $view = new \OC\Files\View($this->userFilesDir);
- $fileOwnerUid = $view->getOwner( $path );
+ // handle public access
+ if ($fileOwnerUid === false && $this->isPublic) {
+ $filename = $path;
+ $fileOwnerUid = $GLOBALS['fileOwner'];
- // handle public access
- if($fileOwnerUid === false && $this->isPublic) {
- $filename = $path;
- $fileOwnerUid = $GLOBALS['fileOwner'];
+ return array($fileOwnerUid, $filename);
+ } else {
- return array ( $fileOwnerUid, $filename );
- } else {
+ // Check that UID is valid
+ if (!\OCP\User::userExists($fileOwnerUid)) {
+ throw new \Exception('Could not find owner (UID = "' . var_export($fileOwnerUid, 1) . '") of file "' . $path . '"');
+ }
- // Check that UID is valid
- if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
- throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
- }
+ // NOTE: Bah, this dependency should be elsewhere
+ \OC\Files\Filesystem::initMountPoints($fileOwnerUid);
- // NOTE: Bah, this dependency should be elsewhere
- \OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
+ // If the file owner is the currently logged in user
+ if ($fileOwnerUid == $this->userId) {
- // If the file owner is the currently logged in user
- if ( $fileOwnerUid == $this->userId ) {
+ // Assume the path supplied is correct
+ $filename = $path;
- // Assume the path supplied is correct
- $filename = $path;
+ } else {
- } else {
+ $info = $view->getFileInfo($path);
+ $ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
- $info = $view->getFileInfo( $path );
- $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
+ // Fetch real file path from DB
+ $filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
- // Fetch real file path from DB
- $filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
+ }
- }
+ return array($fileOwnerUid, $filename);
+ }
- return array ( $fileOwnerUid, $filename );
- }
-
}
/**
* @brief geo recursively through a dir and collect all files and sub files.
- * @param type $dir relative to the users files folder
+ * @param string $dir relative to the users files folder
* @return array with list of files relative to the users files folder
*/
- public function getAllFiles( $dir ) {
-
+ public function getAllFiles($dir)
+ {
+
$result = array();
- $content = $this->view->getDirectoryContent( $this->userFilesDir . $dir );
+ $content = $this->view->getDirectoryContent($this->userFilesDir . $dir);
// handling for re shared folders
- $path_split = explode( '/', $dir );
+ $path_split = explode('/', $dir);
$shared = '';
-
- if( $path_split[1] === 'Shared' ) {
-
+
+ if ($path_split[1] === 'Shared') {
+
$shared = '/Shared';
-
+
}
- foreach ( $content as $c ) {
-
- $sharedPart = $path_split[sizeof( $path_split )-1];
- $targetPathSplit = array_reverse( explode( '/', $c['path'] ) );
+ foreach ($content as $c) {
+
+ $sharedPart = $path_split[sizeof($path_split) - 1];
+ $targetPathSplit = array_reverse(explode('/', $c['path']));
$path = '';
// rebuild path
- foreach ( $targetPathSplit as $pathPart ) {
-
- if ( $pathPart !== $sharedPart ) {
-
+ foreach ($targetPathSplit as $pathPart) {
+
+ if ($pathPart !== $sharedPart) {
+
$path = '/' . $pathPart . $path;
-
+
} else {
-
+
break;
-
+
}
-
+
}
- $path = $dir.$path;
+ $path = $dir . $path;
+
+ if ($c['type'] === "dir") {
+
+ $result = array_merge($result, $this->getAllFiles($path));
- if ($c['type'] === "dir" ) {
-
- $result = array_merge( $result, $this->getAllFiles( $path ) );
-
} else {
-
+
$result[] = $path;
-
+
}
}
-
+
return $result;
-
+
}
/**
@@ -1211,13 +1257,14 @@ class Util {
* @param int $id of the current share
* @return array of the parent
*/
- public static function getShareParent( $id ) {
+ public static function getShareParent($id)
+ {
- $query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
- .' FROM `*PREFIX*share`'
- .' WHERE `id` = ?' );
+ $query = \OC_DB::prepare('SELECT `file_target`, `item_type`'
+ . ' FROM `*PREFIX*share`'
+ . ' WHERE `id` = ?');
- $result = $query->execute( array( $id ) );
+ $result = $query->execute(array($id));
$row = $result->fetchRow();
@@ -1230,13 +1277,14 @@ class Util {
* @param int $id of the current share
* @return array of the parent
*/
- public static function getParentFromShare( $id ) {
+ public static function getParentFromShare($id)
+ {
- $query = \OC_DB::prepare( 'SELECT `parent`'
- .' FROM `*PREFIX*share`'
- .' WHERE `id` = ?' );
+ $query = \OC_DB::prepare('SELECT `parent`'
+ . ' FROM `*PREFIX*share`'
+ . ' WHERE `id` = ?');
- $result = $query->execute( array( $id ) );
+ $result = $query->execute(array($id));
$row = $result->fetchRow();
@@ -1246,57 +1294,70 @@ class Util {
/**
* @brief get owner of the shared files.
- * @param int $Id of a share
- * @return owner
+ * @param $id
+ * @internal param int $Id of a share
+ * @return string owner
*/
- public function getOwnerFromSharedFile( $id ) {
-
- $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
- $source = $query->execute( array( $id ) )->fetchRow();
+ public function getOwnerFromSharedFile($id)
+ {
+
+ $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+ $source = $query->execute(array($id))->fetchRow();
+
+ if (isset($source['parent'])) {
- if ( isset($source['parent'] ) ) {
-
$parent = $source['parent'];
-
- while ( isset( $parent ) ) {
-
- $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
- $item = $query->execute( array( $parent ) )->fetchRow();
-
- if ( isset( $item['parent'] ) ) {
-
+
+ while (isset($parent)) {
+
+ $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+ $item = $query->execute(array($parent))->fetchRow();
+
+ if (isset($item['parent'])) {
+
$parent = $item['parent'];
-
+
} else {
-
+
$fileOwner = $item['uid_owner'];
-
+
break;
-
+
}
}
-
+
} else {
-
+
$fileOwner = $source['uid_owner'];
-
+
}
return $fileOwner;
-
+
}
- public function getUserId()
- {
- return $this->userId;
- }
+ /**
+ * @return string
+ */
+ public function getUserId()
+ {
+ return $this->userId;
+ }
- public function getUserFilesDir()
- {
- return $this->userFilesDir;
- }
+ /**
+ * @return string
+ */
+ public function getUserFilesDir()
+ {
+ return $this->userFilesDir;
+ }
- public function checkRecoveryPassword($password) {
+ /**
+ * @param $password
+ * @return bool
+ */
+ public function checkRecoveryPassword($password)
+ {
$pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
$pathControlData = '/control-file/controlfile.enc';
@@ -1315,30 +1376,35 @@ class Util {
if ($decryptedControlData === 'ownCloud') {
return true;
- }
-
+ }
+
return false;
}
- public function getRecoveryKeyId() {
+ /**
+ * @return string
+ */
+ public function getRecoveryKeyId()
+ {
return $this->recoveryKeyId;
}
/**
* @brief add recovery key to all encrypted files
*/
- public function addRecoveryKeys($path = '/') {
- $dirContent = $this->view->getDirectoryContent($this->keyfilesPath.$path);
+ public function addRecoveryKeys($path = '/')
+ {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
foreach ($dirContent as $item) {
$filePath = substr($item['path'], 25);
if ($item['type'] == 'dir') {
- $this->addRecoveryKeys($filePath.'/');
+ $this->addRecoveryKeys($filePath . '/');
} else {
$session = new Session(new \OC_FilesystemView('/'));
$sharingEnabled = \OCP\Share::isEnabled();
$file = substr($filePath, 0, -4);
$usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
- $this->setSharedFileKeyfiles( $session, $usersSharing, $file );
+ $this->setSharedFileKeyfiles($session, $usersSharing, $file);
}
}
}
@@ -1346,25 +1412,27 @@ class Util {
/**
* @brief remove recovery key to all encrypted files
*/
- public function removeRecoveryKeys($path = '/') {
- $dirContent = $this->view->getDirectoryContent($this->keyfilesPath.$path);
+ public function removeRecoveryKeys($path = '/')
+ {
+ $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
foreach ($dirContent as $item) {
$filePath = substr($item['path'], 25);
if ($item['type'] == 'dir') {
- $this->removeRecoveryKeys($filePath.'/');
+ $this->removeRecoveryKeys($filePath . '/');
} else {
$file = substr($filePath, 0, -4);
- $this->view->unlink($this->shareKeysPath.'/'.$file.'.'.$this->recoveryKeyId.'.shareKey');
+ $this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
}
}
}
/**
* @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
- * @param type $file
- * @param type $privateKey recovery key to decrypt the file
+ * @param string $file
+ * @param string $privateKey recovery key to decrypt the file
*/
- private function recoverFile($file, $privateKey) {
+ private function recoverFile($file, $privateKey)
+ {
$sharingEnabled = \OCP\Share::isEnabled();
@@ -1385,17 +1453,17 @@ class Util {
\OC_FileProxy::$enabled = false;
//decrypt file key
- $encKeyfile = $this->view->file_get_contents($this->keyfilesPath.$file.".key");
- $shareKey = $this->view->file_get_contents($this->shareKeysPath.$file.".".$this->recoveryKeyId.".shareKey");
+ $encKeyfile = $this->view->file_get_contents($this->keyfilesPath . $file . ".key");
+ $shareKey = $this->view->file_get_contents($this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey");
$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
// encrypt file key again to all users, this time with the new public key for the recovered use
$userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
// write new keys to filesystem TDOO!
- $this->view->file_put_contents($this->keyfilesPath.$file.'.key', $multiEncKey['data']);
+ $this->view->file_put_contents($this->keyfilesPath . $file . '.key', $multiEncKey['data']);
foreach ($multiEncKey['keys'] as $userId => $shareKey) {
- $shareKeyPath = $this->shareKeysPath.$file.'.'.$userId.'.shareKey';
+ $shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
$this->view->file_put_contents($shareKeyPath, $shareKey);
}
@@ -1405,10 +1473,11 @@ class Util {
/**
* @brief collect all files and recover them one by one
- * @param type $path to look for files keys
- * @param type $privateKey private recovery key which is used to decrypt the files
+ * @param string $path to look for files keys
+ * @param string $privateKey private recovery key which is used to decrypt the files
*/
- private function recoverAllFiles($path, $privateKey) {
+ private function recoverAllFiles($path, $privateKey)
+ {
$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
foreach ($dirContent as $item) {
$filePath = substr($item['path'], 25);
@@ -1423,16 +1492,17 @@ class Util {
/**
* @brief recover users files in case of password lost
- * @param type $recoveryPassword
+ * @param string $recoveryPassword
*/
- public function recoverUsersFiles($recoveryPassword) {
+ public function recoverUsersFiles($recoveryPassword)
+ {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/'.$this->recoveryKeyId.'.private.key' );
- $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $recoveryPassword );
+ $encryptedKey = $this->view->file_get_contents('/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
+ $privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $recoveryPassword);
\OC_FileProxy::$enabled = $proxyStatus;
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index c669aec122..5b5a2189a4 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,22 +7,23 @@
* See the COPYING-README file.
*/
-require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../lib/helper.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+require_once realpath(dirname(__FILE__) . '/../../../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
use OCA\Encryption;
/**
* Class Test_Encryption_Crypt
*/
-class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
+{
public $userId;
public $pass;
@@ -38,39 +39,40 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
public $genPrivateKey;
public $genPublicKey;
- function setUp() {
- // reset backend
- \OC_User::clearBackends();
- \OC_User::useBackend('database');
+ function setUp()
+ {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
- // set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+ // set content for encrypting / decrypting in tests
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->dataShort = 'hats';
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
$this->randomKey = Encryption\Crypt::generateKey();
-
+
$keypair = Encryption\Crypt::createKeypair();
- $this->genPublicKey = $keypair['publicKey'];
+ $this->genPublicKey = $keypair['publicKey'];
$this->genPrivateKey = $keypair['privateKey'];
-
- $this->view = new \OC_FilesystemView( '/' );
-
- \OC_User::setUserId( 'admin' );
+
+ $this->view = new \OC_FilesystemView('/');
+
+ \OC_User::setUserId('admin');
$this->userId = 'admin';
$this->pass = 'admin';
- $userHome = \OC_User::getHome($this->userId);
- $this->dataDir = str_replace('/'.$this->userId, '', $userHome);
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
- // Filesystem related hooks
- \OCA\Encryption\Helper::registerFilesystemHooks();
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
// Filesystem related hooks
\OCA\Encryption\Helper::registerUserHooks();
- \OC_FileProxy::register(new OCA\Encryption\Proxy());
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
@@ -78,19 +80,20 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
- \OC_Util::tearDownFS();
- \OC_User::setUserId('');
- \OC\Files\Filesystem::tearDown();
- \OC_Util::setupFS($this->userId);
- \OC_User::setUserId($this->userId);
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
- $params['uid'] = $this->userId;
- $params['password'] = $this->pass;
- OCA\Encryption\Hooks::login($params);
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
}
-
- function tearDown() {
+
+ function tearDown()
+ {
\OC_FileProxy::clearProxies();
// reset app files_trashbin
@@ -99,285 +102,297 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
} else {
OC_App::disable('files_trashbin');
}
- }
+ }
+
+ function testGenerateKey()
+ {
- function testGenerateKey() {
-
# TODO: use more accurate (larger) string length for test confirmation
-
+
$key = Encryption\Crypt::generateKey();
-
- $this->assertTrue( strlen( $key ) > 16 );
-
+
+ $this->assertTrue(strlen($key) > 16);
+
}
/**
* @return String
*/
- function testGenerateIv() {
-
+ function testGenerateIv()
+ {
+
$iv = Encryption\Crypt::generateIv();
-
- $this->assertEquals( 16, strlen( $iv ) );
-
+
+ $this->assertEquals(16, strlen($iv));
+
return $iv;
-
+
}
-
+
/**
* @depends testGenerateIv
*/
- function testConcatIv( $iv ) {
-
- $catFile = Encryption\Crypt::concatIv( $this->dataLong, $iv );
-
+ function testConcatIv($iv)
+ {
+
+ $catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
+
// Fetch encryption metadata from end of file
- $meta = substr( $catFile, -22 );
-
- $identifier = substr( $meta, 0, 6);
-
+ $meta = substr($catFile, -22);
+
+ $identifier = substr($meta, 0, 6);
+
// Fetch IV from end of file
- $foundIv = substr( $meta, 6 );
-
- $this->assertEquals( '00iv00', $identifier );
-
- $this->assertEquals( $iv, $foundIv );
-
+ $foundIv = substr($meta, 6);
+
+ $this->assertEquals('00iv00', $identifier);
+
+ $this->assertEquals($iv, $foundIv);
+
// Remove IV and IV identifier text to expose encrypted content
- $data = substr( $catFile, 0, -22 );
-
- $this->assertEquals( $this->dataLong, $data );
-
+ $data = substr($catFile, 0, -22);
+
+ $this->assertEquals($this->dataLong, $data);
+
return array(
'iv' => $iv
- , 'catfile' => $catFile
+ , 'catfile' => $catFile
);
-
+
}
-
+
/**
* @depends testConcatIv
*/
- function testSplitIv( $testConcatIv ) {
-
+ function testSplitIv($testConcatIv)
+ {
+
// Split catfile into components
- $splitCatfile = Encryption\Crypt::splitIv( $testConcatIv['catfile'] );
-
+ $splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
+
// Check that original IV and split IV match
- $this->assertEquals( $testConcatIv['iv'], $splitCatfile['iv'] );
-
+ $this->assertEquals($testConcatIv['iv'], $splitCatfile['iv']);
+
// Check that original data and split data match
- $this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
-
+ $this->assertEquals($this->dataLong, $splitCatfile['encrypted']);
+
}
/**
* @return string padded
*/
- function testAddPadding() {
-
- $padded = Encryption\Crypt::addPadding( $this->dataLong );
-
- $padding = substr( $padded, -2 );
-
- $this->assertEquals( 'xx' , $padding );
-
+ function testAddPadding()
+ {
+
+ $padded = Encryption\Crypt::addPadding($this->dataLong);
+
+ $padding = substr($padded, -2);
+
+ $this->assertEquals('xx', $padding);
+
return $padded;
-
+
}
-
+
/**
* @depends testAddPadding
*/
- function testRemovePadding( $padded ) {
-
- $noPadding = Encryption\Crypt::RemovePadding( $padded );
-
- $this->assertEquals( $this->dataLong, $noPadding );
-
+ function testRemovePadding($padded)
+ {
+
+ $noPadding = Encryption\Crypt::RemovePadding($padded);
+
+ $this->assertEquals($this->dataLong, $noPadding);
+
}
-
- function testEncrypt() {
-
- $random = openssl_random_pseudo_bytes( 13 );
- $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
+ function testEncrypt()
+ {
+
+ $random = openssl_random_pseudo_bytes(13);
+
+ $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
- $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
+ $this->assertNotEquals($this->dataUrl, $crypted);
- $this->assertNotEquals( $this->dataUrl, $crypted );
-
}
-
- function testDecrypt() {
-
- $random = openssl_random_pseudo_bytes( 13 );
- $iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
+ function testDecrypt()
+ {
- $crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-
- $decrypt = Encryption\Crypt::decrypt( $crypted, $iv, 'hat' );
+ $random = openssl_random_pseudo_bytes(13);
+
+ $iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+ $crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+ $decrypt = Encryption\Crypt::decrypt($crypted, $iv, 'hat');
+
+ $this->assertEquals($this->dataUrl, $decrypt);
- $this->assertEquals( $this->dataUrl, $decrypt );
-
}
-
- function testSymmetricEncryptFileContent() {
-
+
+ function testSymmetricEncryptFileContent()
+ {
+
# TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContent( $this->dataShort, 'hat' );
- $this->assertNotEquals( $this->dataShort, $crypted );
-
+ $crypted = Encryption\Crypt::symmetricEncryptFileContent($this->dataShort, 'hat');
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted, 'hat' );
+ $this->assertNotEquals($this->dataShort, $crypted);
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted, 'hat');
+
+ $this->assertEquals($this->dataShort, $decrypt);
- $this->assertEquals( $this->dataShort, $decrypt );
-
}
- function testSymmetricStreamEncryptShortFileContent() {
-
- $filename = 'tmp-'.time().'.test';
+ function testSymmetricStreamEncryptShortFileContent()
+ {
+
+ $filename = 'tmp-' . time() . '.test';
+
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
// Check that the file was encrypted before being written to disk
- $this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
+ $this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
- // Get the encrypted keyfile
- $encKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
- // Attempt to fetch the user's shareKey
- $shareKey = Encryption\Keymanager::getShareKey( $this->view, $this->userId, $filename );
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
- // get session
- $session = new Encryption\Session( $this->view );
+ // get session
+ $session = new Encryption\Session($this->view);
- // get private key
- $privateKey = $session->getPrivateKey( $this->userId );
+ // get private key
+ $privateKey = $session->getPrivateKey($this->userId);
- // Decrypt keyfile with shareKey
- $plainKeyfile = Encryption\Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
- // Manually decrypt
- $manualDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $retreivedCryptedFile, $plainKeyfile );
+ // Manually decrypt
+ $manualDecrypt = Encryption\Crypt::symmetricDecryptFileContent($retreivedCryptedFile, $plainKeyfile);
// Check that decrypted data matches
- $this->assertEquals( $this->dataShort, $manualDecrypt );
+ $this->assertEquals($this->dataShort, $manualDecrypt);
- // Teardown
- $this->view->unlink( $this->userId . '/files/' . $filename );
+ // Teardown
+ $this->view->unlink($this->userId . '/files/' . $filename);
- Encryption\Keymanager::deleteFileKey( $this->view, $this->userId, $filename );
+ Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
}
-
+
/**
* @brief Test that data that is written by the crypto stream wrapper
* @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
- * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
+ * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
* reassembly of its data
*/
- function testSymmetricStreamEncryptLongFileContent() {
-
+ function testSymmetricStreamEncryptLongFileContent()
+ {
+
// Generate a a random filename
- $filename = 'tmp-'.time().'.test';
-
+ $filename = 'tmp-' . time() . '.test';
+
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
-
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong . $this->dataLong);
+
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
-
+ $this->assertTrue(is_int($cryptedFile));
+
// Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // Get file contents without using any wrapper to get it's actual contents on disk
+ $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
- // Get file contents without using any wrapper to get it's actual contents on disk
- $retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ // Check that the file was encrypted before being written to disk
+ $this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
- // Check that the file was encrypted before being written to disk
- $this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
-
// Manuallly split saved file into separate IVs and encrypted chunks
$r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
-
+
//print_r($r);
-
+
// Join IVs and their respective data chunks
- $e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11]);//.$r[11], $r[12].$r[13], $r[14] );
-
+ $e = array($r[0] . $r[1], $r[2] . $r[3], $r[4] . $r[5], $r[6] . $r[7], $r[8] . $r[9], $r[10] . $r[11]); //.$r[11], $r[12].$r[13], $r[14] );
+
//print_r($e);
- // Get the encrypted keyfile
- $encKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+ // Get the encrypted keyfile
+ $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
- // Attempt to fetch the user's shareKey
- $shareKey = Encryption\Keymanager::getShareKey( $this->view, $this->userId, $filename );
+ // Attempt to fetch the user's shareKey
+ $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
- // get session
- $session = new Encryption\Session( $this->view );
+ // get session
+ $session = new Encryption\Session($this->view);
- // get private key
- $privateKey = $session->getPrivateKey( $this->userId );
+ // get private key
+ $privateKey = $session->getPrivateKey($this->userId);
- // Decrypt keyfile with shareKey
- $plainKeyfile = Encryption\Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+ // Decrypt keyfile with shareKey
+ $plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
// Set var for reassembling decrypted content
$decrypt = '';
-
+
// Manually decrypt chunk
foreach ($e as $chunk) {
-
- $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $chunk, $plainKeyfile );
-
+
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent($chunk, $plainKeyfile);
+
// Assemble decrypted chunks
$decrypt .= $chunkDecrypt;
-
+
}
-
- $this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
-
+
+ $this->assertEquals($this->dataLong . $this->dataLong, $decrypt);
+
// Teardown
-
- $this->view->unlink( $this->userId . '/files/' . $filename );
-
- Encryption\Keymanager::deleteFileKey( $this->view, $this->userId, $filename );
-
+
+ $this->view->unlink($this->userId . '/files/' . $filename);
+
+ Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+
}
-
+
/**
* @brief Test that data that is read by the crypto stream wrapper
*/
- function testSymmetricStreamDecryptShortFileContent() {
-
- $filename = 'tmp-'.time();
-
+ function testSymmetricStreamDecryptShortFileContent()
+ {
+
+ $filename = 'tmp-' . time();
+
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -387,34 +402,35 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::$enabled = $proxyStatus;
- // Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $filename );
-
- $this->assertEquals( $this->dataShort, $decrypt );
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ $this->assertEquals($this->dataShort, $decrypt);
- // tear down
- $this->view->unlink( $this->userId . '/files/' . $filename );
+ // tear down
+ $this->view->unlink($this->userId . '/files/' . $filename);
}
-
- function testSymmetricStreamDecryptLongFileContent() {
-
- $filename = 'tmp-'.time();
-
+
+ function testSymmetricStreamDecryptLongFileContent()
+ {
+
+ $filename = 'tmp-' . time();
+
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
-
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
- // Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $filename );
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
- $this->assertEquals( $this->dataLong, $decrypt );
+ $this->assertEquals($this->dataLong, $decrypt);
- // tear down
- $this->view->unlink( $this->userId . '/files/' . $filename );
+ // tear down
+ $this->view->unlink($this->userId . '/files/' . $filename);
}
-
+
// Is this test still necessary?
// function testSymmetricBlockStreamDecryptFileContent() {
//
@@ -438,260 +454,274 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
//
// }
- function testSymmetricEncryptFileContentKeyfile() {
-
+ function testSymmetricEncryptFileContentKeyfile()
+ {
+
# TODO: search in keyfile for actual content as IV will ensure this test always passes
-
- $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-
- $this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-
-
- $decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted['encrypted'], $crypted['key'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
- }
-
- function testIsEncryptedContent() {
-
- $this->assertFalse( Encryption\Crypt::isCatfileContent( $this->dataUrl ) );
-
- $this->assertFalse( Encryption\Crypt::isCatfileContent( $this->legacyEncryptedData ) );
-
- $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
-
- $this->assertTrue( Encryption\Crypt::isCatfileContent( $keyfileContent ) );
-
- }
-
- function testMultiKeyEncrypt() {
-
+
+ $crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->dataUrl);
+
+ $this->assertNotEquals($this->dataUrl, $crypted['encrypted']);
+
+
+ $decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted['encrypted'], $crypted['key']);
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
+ }
+
+ function testIsEncryptedContent()
+ {
+
+ $this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
+
+ $this->assertFalse(Encryption\Crypt::isCatfileContent($this->legacyEncryptedData));
+
+ $keyfileContent = Encryption\Crypt::symmetricEncryptFileContent($this->dataUrl, 'hat');
+
+ $this->assertTrue(Encryption\Crypt::isCatfileContent($keyfileContent));
+
+ }
+
+ function testMultiKeyEncrypt()
+ {
+
# TODO: search in keyfile for actual content as IV will ensure this test always passes
-
+
$pair1 = Encryption\Crypt::createKeypair();
-
- $this->assertEquals( 2, count( $pair1 ) );
-
- $this->assertTrue( strlen( $pair1['publicKey'] ) > 1 );
-
- $this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
-
-
- $crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataShort, array( $pair1['publicKey'] ) );
-
- $this->assertNotEquals( $this->dataShort, $crypted['data'] );
-
-
- $decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['data'], $crypted['keys'][0], $pair1['privateKey'] );
-
- $this->assertEquals( $this->dataShort, $decrypt );
-
- }
-
- function testKeyEncrypt() {
-
+
+ $this->assertEquals(2, count($pair1));
+
+ $this->assertTrue(strlen($pair1['publicKey']) > 1);
+
+ $this->assertTrue(strlen($pair1['privateKey']) > 1);
+
+
+ $crypted = Encryption\Crypt::multiKeyEncrypt($this->dataShort, array($pair1['publicKey']));
+
+ $this->assertNotEquals($this->dataShort, $crypted['data']);
+
+
+ $decrypt = Encryption\Crypt::multiKeyDecrypt($crypted['data'], $crypted['keys'][0], $pair1['privateKey']);
+
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ }
+
+ function testKeyEncrypt()
+ {
+
// Generate keypair
$pair1 = Encryption\Crypt::createKeypair();
-
+
// Encrypt data
- $crypted = Encryption\Crypt::keyEncrypt( $this->dataUrl, $pair1['publicKey'] );
-
- $this->assertNotEquals( $this->dataUrl, $crypted );
-
+ $crypted = Encryption\Crypt::keyEncrypt($this->dataUrl, $pair1['publicKey']);
+
+ $this->assertNotEquals($this->dataUrl, $crypted);
+
// Decrypt data
- $decrypt = Encryption\Crypt::keyDecrypt( $crypted, $pair1['privateKey'] );
-
- $this->assertEquals( $this->dataUrl, $decrypt );
-
+ $decrypt = Encryption\Crypt::keyDecrypt($crypted, $pair1['privateKey']);
+
+ $this->assertEquals($this->dataUrl, $decrypt);
+
}
-
+
/**
* @brief test encryption using legacy blowfish method
*/
- function testLegacyEncryptShort() {
-
- $crypted = Encryption\Crypt::legacyEncrypt( $this->dataShort, $this->pass );
+ function testLegacyEncryptShort()
+ {
+
+ $crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
+
+ $this->assertNotEquals($this->dataShort, $crypted);
- $this->assertNotEquals( $this->dataShort, $crypted );
-
# TODO: search inencrypted text for actual content to ensure it
# genuine transformation
-
+
return $crypted;
-
+
}
-
+
/**
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptShort
*/
- function testLegacyDecryptShort( $crypted ) {
-
- $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-
- $this->assertEquals( $this->dataShort, $decrypted );
-
+ function testLegacyDecryptShort($crypted)
+ {
+
+ $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+
+ $this->assertEquals($this->dataShort, $decrypted);
+
}
/**
* @brief test encryption using legacy blowfish method
*/
- function testLegacyEncryptLong() {
-
- $crypted = Encryption\Crypt::legacyEncrypt( $this->dataLong, $this->pass );
+ function testLegacyEncryptLong()
+ {
+
+ $crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
+
+ $this->assertNotEquals($this->dataLong, $crypted);
- $this->assertNotEquals( $this->dataLong, $crypted );
-
# TODO: search inencrypted text for actual content to ensure it
# genuine transformation
-
+
return $crypted;
-
+
}
-
+
/**
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptLong
*/
- function testLegacyDecryptLong( $crypted ) {
-
- $decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-
- $this->assertEquals( $this->dataLong, $decrypted );
-
- }
-
+ function testLegacyDecryptLong($crypted)
+ {
+
+ $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+
+ $this->assertEquals($this->dataLong, $decrypted);
+
+ }
+
/**
* @brief test generation of legacy encryption key
* @depends testLegacyDecryptShort
*/
- function testLegacyCreateKey() {
-
+ function testLegacyCreateKey()
+ {
+
// Create encrypted key
- $encKey = Encryption\Crypt::legacyCreateKey( $this->pass );
-
+ $encKey = Encryption\Crypt::legacyCreateKey($this->pass);
+
// Decrypt key
- $key = Encryption\Crypt::legacyDecrypt( $encKey, $this->pass );
-
- $this->assertTrue( is_numeric( $key ) );
-
+ $key = Encryption\Crypt::legacyDecrypt($encKey, $this->pass);
+
+ $this->assertTrue(is_numeric($key));
+
// Check that key is correct length
- $this->assertEquals( 20, strlen( $key ) );
-
+ $this->assertEquals(20, strlen($key));
+
}
/**
* @brief test decryption using legacy blowfish method
* @depends testLegacyEncryptLong
*/
- function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
-
- $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
-
- $this->assertNotEquals( $this->dataLong, $recrypted['data'] );
-
+ function testLegacyKeyRecryptKeyfileEncrypt($crypted)
+ {
+
+ $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
+
+ $this->assertNotEquals($this->dataLong, $recrypted['data']);
+
return $recrypted;
-
+
# TODO: search inencrypted text for actual content to ensure it
# genuine transformation
-
+
}
- function testRenameFile() {
+ function testRenameFile()
+ {
- $filename = 'tmp-'.time();
+ $filename = 'tmp-' . time();
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $filename );
+ $decrypt = file_get_contents('crypt://' . $filename);
- $this->assertEquals( $this->dataLong, $decrypt );
+ $this->assertEquals($this->dataLong, $decrypt);
- $newFilename = 'tmp-new-'.time();
- $view = new \OC\Files\View('/' . $this->userId . '/files');
- $view->rename( $filename, $newFilename );
+ $newFilename = 'tmp-new-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->rename($filename, $newFilename);
- // Get file decrypted contents
- $newDecrypt = file_get_contents( 'crypt://' . $newFilename );
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFilename);
- $this->assertEquals( $this->dataLong, $newDecrypt );
+ $this->assertEquals($this->dataLong, $newDecrypt);
- // tear down
- $view->unlink( $newFilename );
- }
+ // tear down
+ $view->unlink($newFilename);
+ }
- function testMoveFileIntoFolder() {
+ function testMoveFileIntoFolder()
+ {
- $filename = 'tmp-'.time();
+ $filename = 'tmp-' . time();
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+ // Save long data as encrypted file using stream wrapper
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
- // Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
- // Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $filename );
+ // Get file decrypted contents
+ $decrypt = file_get_contents('crypt://' . $filename);
- $this->assertEquals( $this->dataLong, $decrypt );
+ $this->assertEquals($this->dataLong, $decrypt);
- $newFolder = '/newfolder'.time();
- $newFilename = 'tmp-new-'.time();
- $view = new \OC\Files\View('/' . $this->userId . '/files');
- $view->mkdir($newFolder);
- $view->rename( $filename, $newFolder . '/' . $newFilename );
+ $newFolder = '/newfolder' . time();
+ $newFilename = 'tmp-new-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+ $view->mkdir($newFolder);
+ $view->rename($filename, $newFolder . '/' . $newFilename);
- // Get file decrypted contents
- $newDecrypt = file_get_contents( 'crypt://' . $newFolder . '/' . $newFilename );
+ // Get file decrypted contents
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . '/' . $newFilename);
- $this->assertEquals( $this->dataLong, $newDecrypt );
+ $this->assertEquals($this->dataLong, $newDecrypt);
- // tear down
- $view->unlink( $newFolder );
- }
+ // tear down
+ $view->unlink($newFolder);
+ }
- function testMoveFolder() {
+ function testMoveFolder()
+ {
$view = new \OC\Files\View('/' . $this->userId . '/files');
- $filename = '/tmp-'.time();
- $folder = '/folder'.time();
+ $filename = '/tmp-' . time();
+ $folder = '/folder' . time();
$view->mkdir($folder);
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $folder . $filename, $this->dataLong );
+ $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $folder . $filename );
+ $decrypt = file_get_contents('crypt://' . $folder . $filename);
- $this->assertEquals( $this->dataLong, $decrypt );
+ $this->assertEquals($this->dataLong, $decrypt);
- $newFolder = '/newfolder'.time();
+ $newFolder = '/newfolder' . time();
- $view->rename( $folder, $newFolder );
+ $view->rename($folder, $newFolder);
// Get file decrypted contents
- $newDecrypt = file_get_contents( 'crypt://' . $newFolder . $filename );
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
- $this->assertEquals( $this->dataLong, $newDecrypt );
+ $this->assertEquals($this->dataLong, $newDecrypt);
// tear down
- $view->unlink( $newFolder );
+ $view->unlink($newFolder);
}
- function testRenameFolder() {
+ function testRenameFolder()
+ {
- $filename = '/tmp-'.time();
+ $filename = '/tmp-' . time();
$folder = '/folder';
$newFolder = '/newfolder';
@@ -699,42 +729,43 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$view->mkdir($folder);
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $folder . $filename, $this->dataLong );
+ $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $folder . $filename );
+ $decrypt = file_get_contents('crypt://' . $folder . $filename);
- $this->assertEquals( $this->dataLong, $decrypt );
+ $this->assertEquals($this->dataLong, $decrypt);
// rename folder
$view->rename($folder, $newFolder);
// Get file decrypted contents
- $newDecrypt = file_get_contents( 'crypt://' . $newFolder . $filename );
+ $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
- $this->assertEquals( $this->dataLong, $newDecrypt );
+ $this->assertEquals($this->dataLong, $newDecrypt);
// tear down
- $view->unlink( $newFolder );
+ $view->unlink($newFolder);
}
- function testChangePassphrase() {
+ function testChangePassphrase()
+ {
- $filename = 'tmp-'.time();
+ $filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+ $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents( 'crypt://' . $filename );
+ $decrypt = file_get_contents('crypt://' . $filename);
- $this->assertEquals( $this->dataLong, $decrypt );
+ $this->assertEquals($this->dataLong, $decrypt);
// change password
\OC_User::setPassword($this->userId, 'test', null);
@@ -745,109 +776,113 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
OCA\Encryption\Hooks::login($params);
// Get file decrypted contents
- $newDecrypt = file_get_contents( 'crypt://' . $filename );
+ $newDecrypt = file_get_contents('crypt://' . $filename);
- $this->assertEquals( $this->dataLong, $newDecrypt );
+ $this->assertEquals($this->dataLong, $newDecrypt);
// tear down
// change password back
\OC_User::setPassword($this->userId, $this->pass);
$view = new \OC\Files\View('/' . $this->userId . '/files');
- $view->unlink( $filename );
+ $view->unlink($filename);
}
- function testViewFilePutAndGetContents() {
+ function testViewFilePutAndGetContents()
+ {
- $filename = '/tmp-'.time();
+ $filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
// Save short data as encrypted file using stream wrapper
- $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = $view->file_get_contents( $filename );
+ $decrypt = $view->file_get_contents($filename);
- $this->assertEquals( $this->dataShort, $decrypt );
+ $this->assertEquals($this->dataShort, $decrypt);
// Save long data as encrypted file using stream wrapper
- $cryptedFileLong = $view->file_put_contents( $filename, $this->dataLong );
+ $cryptedFileLong = $view->file_put_contents($filename, $this->dataLong);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFileLong ) );
+ $this->assertTrue(is_int($cryptedFileLong));
// Get file decrypted contents
- $decryptLong = $view->file_get_contents( $filename );
+ $decryptLong = $view->file_get_contents($filename);
- $this->assertEquals( $this->dataLong, $decryptLong );
+ $this->assertEquals($this->dataLong, $decryptLong);
// tear down
- $view->unlink( $filename );
+ $view->unlink($filename);
}
- function testTouchExistingFile() {
- $filename = '/tmp-'.time();
+ function testTouchExistingFile()
+ {
+ $filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
// Save short data as encrypted file using stream wrapper
- $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
$view->touch($filename);
// Get file decrypted contents
- $decrypt = $view->file_get_contents( $filename );
+ $decrypt = $view->file_get_contents($filename);
- $this->assertEquals( $this->dataShort, $decrypt );
+ $this->assertEquals($this->dataShort, $decrypt);
// tear down
- $view->unlink( $filename );
+ $view->unlink($filename);
}
- function testTouchFile() {
- $filename = '/tmp-'.time();
+ function testTouchFile()
+ {
+ $filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
$view->touch($filename);
// Save short data as encrypted file using stream wrapper
- $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = $view->file_get_contents( $filename );
+ $decrypt = $view->file_get_contents($filename);
- $this->assertEquals( $this->dataShort, $decrypt );
+ $this->assertEquals($this->dataShort, $decrypt);
// tear down
- $view->unlink( $filename );
+ $view->unlink($filename);
}
- function testFopenFile() {
- $filename = '/tmp-'.time();
+ function testFopenFile()
+ {
+ $filename = '/tmp-' . time();
$view = new \OC\Files\View('/' . $this->userId . '/files');
// Save short data as encrypted file using stream wrapper
- $cryptedFile = $view->file_put_contents( $filename, $this->dataShort );
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
// Test that data was successfully written
- $this->assertTrue( is_int( $cryptedFile ) );
+ $this->assertTrue(is_int($cryptedFile));
$handle = $view->fopen($filename, 'r');
// Get file decrypted contents
$decrypt = fgets($handle);
- $this->assertEquals( $this->dataShort, $decrypt );
+ $this->assertEquals($this->dataShort, $decrypt);
// tear down
- $view->unlink( $filename );
+ $view->unlink($filename);
}
// function testEncryption(){
//
@@ -912,5 +947,5 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
// $this->assertEquals($decrypted,$source);
// }
-
+
}
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 8ca8b0287e..334cc743f2 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -6,21 +6,22 @@
* See the COPYING-README file.
*/
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../lib/helper.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
use OCA\Encryption;
/**
* Class Test_Encryption_Keymanager
*/
-class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
+{
public $userId;
public $pass;
@@ -31,38 +32,39 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
public $view;
public $randomKey;
- function setUp() {
- // reset backend
- \OC_User::clearBackends();
- \OC_User::useBackend('database');
+ function setUp()
+ {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
\OC_FileProxy::$enabled = false;
-
+
// set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->dataShort = 'hats';
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
$this->randomKey = Encryption\Crypt::generateKey();
-
+
$keypair = Encryption\Crypt::createKeypair();
- $this->genPublicKey = $keypair['publicKey'];
+ $this->genPublicKey = $keypair['publicKey'];
$this->genPrivateKey = $keypair['privateKey'];
- $this->view = new \OC_FilesystemView( '/' );
+ $this->view = new \OC_FilesystemView('/');
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
- $userHome = \OC_User::getHome($this->userId);
- $this->dataDir = str_replace('/'.$this->userId, '', $userHome);
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
- // Filesystem related hooks
- \OCA\Encryption\Helper::registerFilesystemHooks();
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
- \OC_FileProxy::register(new OCA\Encryption\Proxy());
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
@@ -70,19 +72,20 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
// we don't want to tests with app files_trashbin enabled
\OC_App::disable('files_trashbin');
- \OC_Util::tearDownFS();
- \OC_User::setUserId('');
- \OC\Files\Filesystem::tearDown();
- \OC_Util::setupFS($this->userId);
- \OC_User::setUserId($this->userId);
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
- $params['uid'] = $this->userId;
- $params['password'] = $this->pass;
- OCA\Encryption\Hooks::login($params);
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
}
-
- function tearDown(){
-
+
+ function tearDown()
+ {
+
\OC_FileProxy::$enabled = true;
\OC_FileProxy::clearProxies();
@@ -94,11 +97,12 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
}
}
- function testGetPrivateKey() {
-
- $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+ function testGetPrivateKey()
+ {
+
+ $key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
- $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->pass);
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent($key, $this->pass);
$res = openssl_pkey_get_private($privateKey);
@@ -107,12 +111,13 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$sslInfo = openssl_pkey_get_details($res);
$this->assertArrayHasKey('key', $sslInfo);
-
+
}
-
- function testGetPublicKey() {
- $publiceKey = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
+ function testGetPublicKey()
+ {
+
+ $publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
$res = openssl_pkey_get_public($publiceKey);
@@ -122,40 +127,41 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$this->assertArrayHasKey('key', $sslInfo);
}
-
- function testSetFileKey() {
-
+
+ function testSetFileKey()
+ {
+
# NOTE: This cannot be tested until we are able to break out
# of the FileSystemView data directory root
-
- $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->randomKey, 'hat' );
-
- $file = 'unittest-'.time().'.txt';
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->randomKey, 'hat');
+
+ $file = 'unittest-' . time() . '.txt';
- $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
- Encryption\Keymanager::setFileKey( $this->view, $file, $this->userId, $key['key'] );
+ Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = true;
// cleanup
- $this->view->unlink('/'.$this->userId . '/files/' . $file);
+ $this->view->unlink('/' . $this->userId . '/files/' . $file);
// Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
-
+
}
-
+
// /**
// * @depends testGetPrivateKey
// */
@@ -171,10 +177,11 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
// $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
//
// }
-
- function testGetUserKeys() {
-
- $keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
+
+ function testGetUserKeys()
+ {
+
+ $keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
$resPublic = openssl_pkey_get_public($keys['publicKey']);
@@ -184,7 +191,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$this->assertArrayHasKey('key', $sslInfoPublic);
- $privateKey = Encryption\Crypt::symmetricDecryptFileContent( $keys['privateKey'], $this->pass);
+ $privateKey = Encryption\Crypt::symmetricDecryptFileContent($keys['privateKey'], $this->pass);
$resPrivate = openssl_pkey_get_private($privateKey);
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index efff8e322e..a9ee8d0023 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -50,446 +50,446 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
public $subsubfolder;
function setUp()
- {
- // reset backend
- \OC_User::clearBackends();
- \OC_User::useBackend('database');
+ {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
- $this->dataShort = 'hats';
- $this->view = new \OC_FilesystemView('/');
+ $this->dataShort = 'hats';
+ $this->view = new \OC_FilesystemView('/');
- $userHome = \OC_User::getHome('admin');
- $this->dataDir = str_replace('/admin', '', $userHome);
+ $userHome = \OC_User::getHome('admin');
+ $this->dataDir = str_replace('/admin', '', $userHome);
- $this->folder1 = '/folder1';
- $this->subfolder = '/subfolder1';
- $this->subsubfolder = '/subsubfolder1';
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
- $this->filename = 'share-tmp.test';
+ $this->filename = 'share-tmp.test';
- // enable resharing
- \OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+ // enable resharing
+ \OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
- // clear share hooks
- \OC_Hook::clear('OCP\\Share');
- \OC::registerShareHooks();
- \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+ // clear share hooks
+ \OC_Hook::clear('OCP\\Share');
+ \OC::registerShareHooks();
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
- // Sharing related hooks
- \OCA\Encryption\Helper::registerShareHooks();
+ // Sharing related hooks
+ \OCA\Encryption\Helper::registerShareHooks();
- // Filesystem related hooks
- \OCA\Encryption\Helper::registerFilesystemHooks();
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
- \OC_FileProxy::register(new OCA\Encryption\Proxy());
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
- // remember files_trashbin state
- $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
- // we don't want to tests with app files_trashbin enabled
- \OC_App::disable('files_trashbin');
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
- // create users
- $this->loginHelper('user1', true);
- $this->loginHelper('user2', true);
- $this->loginHelper('user3', true);
+ // create users
+ $this->loginHelper('user1', true);
+ $this->loginHelper('user2', true);
+ $this->loginHelper('user3', true);
// create group and assign users
\OC_Group::createGroup('group1');
\OC_Group::addToGroup('user2', 'group1');
\OC_Group::addToGroup('user3', 'group1');
- }
+ }
- function tearDown()
- {
- // reset app files_trashbin
- if ($this->stateFilesTrashbin) {
- OC_App::enable('files_trashbin');
- } else {
- OC_App::disable('files_trashbin');
- }
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
// clean group
\OC_Group::deleteGroup('group1');
- // cleanup users
- \OC_User::deleteUser('user1');
- \OC_User::deleteUser('user2');
- \OC_User::deleteUser('user3');
+ // cleanup users
+ \OC_User::deleteUser('user1');
+ \OC_User::deleteUser('user2');
+ \OC_User::deleteUser('user3');
\OC_FileProxy::clearProxies();
- }
+ }
/**
* @param bool $withTeardown
*/
function testShareFile($withTeardown = true)
- {
- // login as admin
- $this->loginHelper('admin');
+ {
+ // login as admin
+ $this->loginHelper('admin');
- // save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- // test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
- // disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // get the file info from previous created file
- $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
- // check if we have a valid file info
- $this->assertTrue(is_array($fileInfo));
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
- // check if the unencrypted file size is stored
- $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
- // re-enable the file proxy
- \OC_FileProxy::$enabled = $proxyStatus;
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
- // share the file
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // check if share key for user1 exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
- // login as user1
- $this->loginHelper('user1');
+ // login as user1
+ $this->loginHelper('user1');
- // get file contents
- $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
- // check if data is the same as we previously written
- $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
- // cleanup
- if ($withTeardown) {
+ // cleanup
+ if ($withTeardown) {
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // unshare the file
- \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
- // cleanup
- $this->view->unlink('/admin/files/' . $this->filename);
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
- }
- }
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
+ }
/**
* @param bool $withTeardown
*/
function testReShareFile($withTeardown = true)
- {
- $this->testShareFile(false);
+ {
+ $this->testShareFile(false);
- // login as user1
- $this->loginHelper('user1');
+ // login as user1
+ $this->loginHelper('user1');
- // get the file info
- $fileInfo = $this->view->getFileInfo('/user1/files/Shared/' . $this->filename);
+ // get the file info
+ $fileInfo = $this->view->getFileInfo('/user1/files/Shared/' . $this->filename);
- // share the file with user2
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+ // share the file with user2
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // check if share key for user2 exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
- // login as user2
- $this->loginHelper('user2');
+ // login as user2
+ $this->loginHelper('user2');
- // get file contents
- $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
- // check if data is the same as previously written
- $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+ // check if data is the same as previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
- // cleanup
- if ($withTeardown) {
+ // cleanup
+ if ($withTeardown) {
- // login as user1
- $this->loginHelper('user1');
+ // login as user1
+ $this->loginHelper('user1');
- // unshare the file with user2
- \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+ // unshare the file with user2
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
- // unshare the file with user1
- \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+ // unshare the file with user1
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
- // cleanup
- $this->view->unlink('/admin/files/' . $this->filename);
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
- }
- }
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
+ }
/**
* @param bool $withTeardown
* @return array
*/
function testShareFolder($withTeardown = true)
- {
- // login as admin
- $this->loginHelper('admin');
+ {
+ // login as admin
+ $this->loginHelper('admin');
- // create folder structure
- $this->view->mkdir('/admin/files' . $this->folder1);
- $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
- $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+ // create folder structure
+ $this->view->mkdir('/admin/files' . $this->folder1);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
+ $this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
- // save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
- // test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
- // disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // get the file info from previous created folder
- $fileInfo = $this->view->getFileInfo('/admin/files' . $this->folder1);
+ // get the file info from previous created folder
+ $fileInfo = $this->view->getFileInfo('/admin/files' . $this->folder1);
- // check if we have a valid file info
- $this->assertTrue(is_array($fileInfo));
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
- // re-enable the file proxy
- \OC_FileProxy::$enabled = $proxyStatus;
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
- // share the folder with user1
- \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+ // share the folder with user1
+ \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // check if share key for user1 exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ // check if share key for user1 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
- // login as user1
- $this->loginHelper('user1');
+ // login as user1
+ $this->loginHelper('user1');
- // get file contents
- $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
- // check if data is the same
- $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
- // cleanup
- if ($withTeardown) {
+ // cleanup
+ if ($withTeardown) {
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // unshare the folder with user1
- \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+ // unshare the folder with user1
+ \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
- // cleanup
- $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ // cleanup
+ $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
- }
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ }
- return $fileInfo;
- }
+ return $fileInfo;
+ }
/**
* @param bool $withTeardown
*/
function testReShareFolder($withTeardown = true)
- {
- $fileInfoFolder1 = $this->testShareFolder(false);
+ {
+ $fileInfoFolder1 = $this->testShareFolder(false);
- // login as user1
- $this->loginHelper('user1');
+ // login as user1
+ $this->loginHelper('user1');
- // disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // get the file info from previous created folder
- $fileInfoSubFolder = $this->view->getFileInfo('/user1/files/Shared' . $this->folder1 . $this->subfolder);
+ // get the file info from previous created folder
+ $fileInfoSubFolder = $this->view->getFileInfo('/user1/files/Shared' . $this->folder1 . $this->subfolder);
- // check if we have a valid file info
- $this->assertTrue(is_array($fileInfoSubFolder));
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfoSubFolder));
- // re-enable the file proxy
- \OC_FileProxy::$enabled = $proxyStatus;
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
- // share the file with user2
- \OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+ // share the file with user2
+ \OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // check if share key for user2 exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+ // check if share key for user2 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
- // login as user2
- $this->loginHelper('user2');
+ // login as user2
+ $this->loginHelper('user2');
- // get file contents
- $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
- // check if data is the same
- $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
- // get the file info
- $fileInfo = $this->view->getFileInfo('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ // get the file info
+ $fileInfo = $this->view->getFileInfo('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
- // check if we have fileInfos
- $this->assertTrue(is_array($fileInfo));
+ // check if we have fileInfos
+ $this->assertTrue(is_array($fileInfo));
- // share the file with user3
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3', OCP\PERMISSION_ALL);
+ // share the file with user3
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3', OCP\PERMISSION_ALL);
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // check if share key for user3 exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+ // check if share key for user3 exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
- // login as user3
- $this->loginHelper('user3');
+ // login as user3
+ $this->loginHelper('user3');
- // get file contents
- $retrievedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
+ // get file contents
+ $retrievedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
- // check if data is the same
- $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+ // check if data is the same
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
- // cleanup
- if ($withTeardown) {
+ // cleanup
+ if ($withTeardown) {
- // login as user2
- $this->loginHelper('user2');
+ // login as user2
+ $this->loginHelper('user2');
- // unshare the file with user3
- \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3');
+ // unshare the file with user3
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
- // login as user1
- $this->loginHelper('user1');
+ // login as user1
+ $this->loginHelper('user1');
- // unshare the folder with user2
- \OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+ // unshare the folder with user2
+ \OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // unshare the folder1 with user1
- \OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+ // unshare the folder1 with user1
+ \OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
- // cleanup
- $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ // cleanup
+ $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
- }
- }
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ }
+ }
- function testPublicShareFile()
- {
- // login as admin
- $this->loginHelper('admin');
+ function testPublicShareFile()
+ {
+ // login as admin
+ $this->loginHelper('admin');
- // save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- // test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
- // disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // get the file info from previous created file
- $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
- // check if we have a valid file info
- $this->assertTrue(is_array($fileInfo));
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
- // check if the unencrypted file size is stored
- $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
- // re-enable the file proxy
- \OC_FileProxy::$enabled = $proxyStatus;
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
- // share the file
- \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+ $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
- // check if share key for public exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+ // check if share key for public exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
- // some hacking to simulate public link
- $GLOBALS['app'] = 'files_sharing';
- $GLOBALS['fileOwner'] = 'admin';
- \OC_User::setUserId('');
+ // some hacking to simulate public link
+ $GLOBALS['app'] = 'files_sharing';
+ $GLOBALS['fileOwner'] = 'admin';
+ \OC_User::setUserId('');
- // get file contents
- $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
+ // get file contents
+ $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
- // check if data is the same as we previously written
- $this->assertEquals($this->dataShort, $retrievedCryptedFile);
+ // check if data is the same as we previously written
+ $this->assertEquals($this->dataShort, $retrievedCryptedFile);
- // tear down
+ // tear down
- // login as admin
- $this->loginHelper('admin');
+ // login as admin
+ $this->loginHelper('admin');
- // unshare the file
- \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
- // cleanup
- $this->view->unlink('/admin/files/' . $this->filename);
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
- // check if share key not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
- }
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+ }
function testShareFileWithGroup()
{
@@ -581,7 +581,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// save file with content
$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile1));
@@ -589,9 +589,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// check if share key for admin and recovery exists
$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.admin.shareKey'));
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
// disable recovery for admin
$this->assertTrue($util->setRecoveryForUser(0));
@@ -600,8 +600,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$util->removeRecoveryKeys('/');
// check if share key for recovery not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
// enable recovery for admin
$this->assertTrue($util->setRecoveryForUser(1));
@@ -610,16 +610,16 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$util->addRecoveryKeys('/');
// check if share key for admin and recovery exists
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
- $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
// cleanup
$this->view->unlink('/admin/files/' . $this->filename);
- $this->view->unlink('/admin/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename);
+ $this->view->unlink('/admin/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if share key for recovery not exists
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
- $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
}
function testRecoveryForUser()
@@ -648,7 +648,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// save file with content
$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile1));
@@ -656,9 +656,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// check if share key for user and recovery exists
$this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
- $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
- $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.user1.shareKey'));
- $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ $this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
// login as admin
$this->loginHelper('admin');
@@ -671,7 +671,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// get file contents
$retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
- $retrievedCryptedFile2 = file_get_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename);
+ $retrievedCryptedFile2 = file_get_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if data is the same as we previously written
$this->assertEquals($this->dataShort, $retrievedCryptedFile1);
@@ -683,9 +683,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// check if share key for user and recovery exists
$this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
- $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.'.$recoveryKeyId.'.shareKey'));
- $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.user1.shareKey'));
- $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder .'/'. $this->filename . '.'.$recoveryKeyId.'.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
// enable recovery for admin
$this->assertTrue($util->setRecoveryForUser(0));
@@ -697,23 +697,23 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
* @param bool $password
*/
function loginHelper($user, $create = false, $password = false)
- {
- if ($create) {
- \OC_User::createUser($user, $user);
- }
+ {
+ if ($create) {
+ \OC_User::createUser($user, $user);
+ }
- if($password === false) {
+ if ($password === false) {
$password = $user;
}
- \OC_Util::tearDownFS();
- \OC_User::setUserId('');
- \OC\Files\Filesystem::tearDown();
- \OC_Util::setupFS($user);
- \OC_User::setUserId($user);
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($user);
+ \OC_User::setUserId($user);
- $params['uid'] = $user;
- $params['password'] = $password;
- OCA\Encryption\Hooks::login($params);
- }
+ $params['uid'] = $user;
+ $params['password'] = $password;
+ OCA\Encryption\Hooks::login($params);
+ }
}
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 53ac8ee8d6..57ec395342 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -6,20 +6,21 @@
* See the COPYING-README file.
*/
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
use OCA\Encryption;
/**
* Class Test_Encryption_Util
*/
-class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
+{
public $userId;
public $encryptionDir;
@@ -38,132 +39,139 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
public $util;
public $dataShort;
- function setUp() {
- // reset backend
- \OC_User::useBackend('database');
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
- \OC_User::setUserId( 'admin' );
- $this->userId = 'admin';
- $this->pass = 'admin';
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
- // set content for encrypting / decrypting in tests
- $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+ // set content for encrypting / decrypting in tests
+ $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
$this->dataShort = 'hats';
- $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
- $this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
- $this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+ $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+ $this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
$keypair = Encryption\Crypt::createKeypair();
-
- $this->genPublicKey = $keypair['publicKey'];
+
+ $this->genPublicKey = $keypair['publicKey'];
$this->genPrivateKey = $keypair['privateKey'];
-
- $this->publicKeyDir = '/' . 'public-keys';
- $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+
+ $this->publicKeyDir = '/' . 'public-keys';
+ $this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
- $this->view = new \OC_FilesystemView( '/' );
+ $this->view = new \OC_FilesystemView('/');
- $userHome = \OC_User::getHome($this->userId);
- $this->dataDir = str_replace('/'.$this->userId, '', $userHome);
+ $userHome = \OC_User::getHome($this->userId);
+ $this->dataDir = str_replace('/' . $this->userId, '', $userHome);
- // Filesystem related hooks
- \OCA\Encryption\Helper::registerFilesystemHooks();
+ // Filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
- \OC_FileProxy::register(new OCA\Encryption\Proxy());
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
- \OC_Util::tearDownFS();
- \OC_User::setUserId('');
- \OC\Files\Filesystem::tearDown();
- \OC_Util::setupFS($this->userId);
- \OC_User::setUserId($this->userId);
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
- $params['uid'] = $this->userId;
- $params['password'] = $this->pass;
- OCA\Encryption\Hooks::login($params);
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
- $this->util = new Encryption\Util( $this->view, $this->userId );
+ $this->util = new Encryption\Util($this->view, $this->userId);
}
-
- function tearDown(){
-
+
+ function tearDown()
+ {
+
\OC_FileProxy::clearProxies();
}
-
+
/**
* @brief test that paths set during User construction are correct
*/
- function testKeyPaths() {
-
- $util = new Encryption\Util( $this->view, $this->userId );
-
- $this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
- $this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
- $this->assertEquals( $this->keyfilesPath, $util->getPath( 'keyfilesPath' ) );
- $this->assertEquals( $this->publicKeyPath, $util->getPath( 'publicKeyPath' ) );
- $this->assertEquals( $this->privateKeyPath, $util->getPath( 'privateKeyPath' ) );
-
+ function testKeyPaths()
+ {
+
+ $util = new Encryption\Util($this->view, $this->userId);
+
+ $this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
+ $this->assertEquals($this->encryptionDir, $util->getPath('encryptionDir'));
+ $this->assertEquals($this->keyfilesPath, $util->getPath('keyfilesPath'));
+ $this->assertEquals($this->publicKeyPath, $util->getPath('publicKeyPath'));
+ $this->assertEquals($this->privateKeyPath, $util->getPath('privateKeyPath'));
+
}
-
+
/**
* @brief test setup of encryption directories
*/
- function testSetupServerSide() {
-
- $this->assertEquals( true, $this->util->setupServerSide( $this->pass ) );
+ function testSetupServerSide()
+ {
+
+ $this->assertEquals(true, $this->util->setupServerSide($this->pass));
}
-
+
/**
* @brief test checking whether account is ready for encryption,
*/
- function testUserIsReady() {
-
- $this->assertEquals( true, $this->util->ready() );
+ function testUserIsReady()
+ {
+
+ $this->assertEquals(true, $this->util->ready());
}
-
- function testRecoveryEnabledForUser() {
-
- $util = new Encryption\Util( $this->view, $this->userId );
-
+
+ function testRecoveryEnabledForUser()
+ {
+
+ $util = new Encryption\Util($this->view, $this->userId);
+
// Record the value so we can return it to it's original state later
$enabled = $util->recoveryEnabledForUser();
-
- $this->assertTrue( $util->setRecoveryForUser( 1 ) );
-
- $this->assertEquals( 1, $util->recoveryEnabledForUser() );
-
- $this->assertTrue( $util->setRecoveryForUser( 0 ) );
-
- $this->assertEquals( 0, $util->recoveryEnabledForUser() );
-
+
+ $this->assertTrue($util->setRecoveryForUser(1));
+
+ $this->assertEquals(1, $util->recoveryEnabledForUser());
+
+ $this->assertTrue($util->setRecoveryForUser(0));
+
+ $this->assertEquals(0, $util->recoveryEnabledForUser());
+
// Return the setting to it's previous state
- $this->assertTrue( $util->setRecoveryForUser( $enabled ) );
-
+ $this->assertTrue($util->setRecoveryForUser($enabled));
+
}
-
- function testGetUidAndFilename() {
-
- \OC_User::setUserId( 'admin' );
- $filename = 'tmp-'.time().'.test';
+ function testGetUidAndFilename()
+ {
+
+ \OC_User::setUserId('admin');
+
+ $filename = 'tmp-' . time() . '.test';
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- $this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
+ $this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
- $util = new Encryption\Util( $this->view, $this->userId );
+ $util = new Encryption\Util($this->view, $this->userId);
- list($fileOwnerUid, $file) = $util->getUidAndFilename( $filename );
+ list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
- $this->assertEquals('admin', $fileOwnerUid);
+ $this->assertEquals('admin', $fileOwnerUid);
- $this->assertEquals($file, $filename);
+ $this->assertEquals($file, $filename);
}
}
\ No newline at end of file
--
GitLab
From b3b6738d599480fc9bf40a53313598c4766571fb Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 01:47:35 +0200
Subject: [PATCH 253/304] Revert "fix for webdav and wrong reference for
findByStorageId"
This reverts commit 079f918d5ca0d242e77717aaeac82bcf011dc745.
---
lib/files/cache/backgroundwatcher.php | 2 +-
lib/files/filesystem.php | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index b5770d0582..7549745e7d 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/files/cache/backgroundwatcher.php
@@ -30,7 +30,7 @@ class BackgroundWatcher {
return;
}
list($storageId, $internalPath) = $cacheItem;
- $mounts = Mount\Manager::findByStorageId($storageId);
+ $mounts = Mount::findByStorageId($storageId);
if (count($mounts) === 0) {
//if the storage we need isn't mounted on default, try to find a user that has access to the storage
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d0cac9dc1d..d60d430d77 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,9 +236,7 @@ class Filesystem {
}
static public function initMounts(){
- if(!self::$mounts) {
- self::$mounts = new Mount\Manager();
- }
+ self::$mounts = new Mount\Manager();
}
/**
--
GitLab
From 58a8d67a9b3c48567bcc40cc02444311c6773275 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 01:57:16 +0200
Subject: [PATCH 254/304] fix for webdav because initMounts() is triggered
twice so we lost the root path
---
lib/files/filesystem.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d60d430d77..d0cac9dc1d 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,7 +236,9 @@ class Filesystem {
}
static public function initMounts(){
- self::$mounts = new Mount\Manager();
+ if(!self::$mounts) {
+ self::$mounts = new Mount\Manager();
+ }
}
/**
--
GitLab
From 6609de28d832262e8f72fb19e5f0343cd021cca3 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 20 May 2013 02:10:11 +0200
Subject: [PATCH 255/304] [tx-robot] updated from transifex
---
apps/files/l10n/es_AR.php | 1 +
apps/files/l10n/nb_NO.php | 20 +++++-
apps/files_external/l10n/nb_NO.php | 5 ++
apps/files_trashbin/l10n/nb_NO.php | 3 +-
apps/user_ldap/l10n/es.php | 1 +
apps/user_ldap/l10n/it.php | 2 +
l10n/es/user_ldap.po | 9 +--
l10n/es_AR/files.po | 9 +--
l10n/es_AR/settings.po | 9 +--
l10n/it/core.po | 4 +-
l10n/it/files.po | 4 +-
l10n/it/files_encryption.po | 6 +-
l10n/it/files_external.po | 6 +-
l10n/it/files_sharing.po | 6 +-
l10n/it/files_trashbin.po | 6 +-
l10n/it/files_versions.po | 6 +-
l10n/it/lib.po | 18 ++---
l10n/it/settings.po | 4 +-
l10n/it/user_ldap.po | 8 +--
l10n/it/user_webdavauth.po | 8 +--
l10n/nb_NO/files.po | 43 +++++------
l10n/nb_NO/files_external.po | 17 ++---
l10n/nb_NO/files_trashbin.po | 9 +--
l10n/nb_NO/lib.po | 20 +++---
l10n/nb_NO/settings.po | 107 ++++++++++++++--------------
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
lib/l10n/nb_NO.php | 2 +
settings/l10n/es_AR.php | 1 +
settings/l10n/nb_NO.php | 53 +++++++++++++-
39 files changed, 248 insertions(+), 161 deletions(-)
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index af6cf96161..0ae47302ed 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} directorios",
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 1ff21b1f0e..d5710a4927 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,11 +1,16 @@
<?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
+"Could not move %s" => "Kunne ikke flytte %s",
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
"No file was uploaded" => "Ingen filer ble lastet opp",
"Missing a temporary folder" => "Mangler midlertidig mappe",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
+"Not enough storage available" => "Ikke nok lagringsplass",
+"Invalid directory." => "Ugyldig katalog.",
"Files" => "Filer",
"Share" => "Del",
"Delete permanently" => "Slett permanent",
@@ -18,13 +23,21 @@
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
"undo" => "angre",
+"perform delete operation" => "utfør sletting",
"1 file uploading" => "1 fil lastes opp",
"files uploading" => "filer lastes opp",
+"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
+"File name cannot be empty." => "Filnavn kan ikke være tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Not enough space available" => "Ikke nok lagringsplass",
"Upload cancelled." => "Opplasting avbrutt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
"URL cannot be empty." => "URL-en kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
"Error" => "Feil",
"Name" => "Navn",
"Size" => "Størrelse",
@@ -33,6 +46,8 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
+"Unable to rename file" => "Kan ikke gi nytt navn",
"Upload" => "Last opp",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -46,12 +61,15 @@
"Text file" => "Tekstfil",
"Folder" => "Mappe",
"From link" => "Fra link",
+"Deleted files" => "Slettet filer",
"Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
"Unshare" => "Avslutt deling",
"Upload too large" => "Filen er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
-"Current scanning" => "Pågående skanning"
+"Current scanning" => "Pågående skanning",
+"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..."
);
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 961ef2b104..ea8648303d 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -2,6 +2,11 @@
"Access granted" => "Tilgang innvilget",
"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
"Grant access" => "Gi tilgang",
+"Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+"Error configuring Google Drive storage" => "Feil med konfigurering av Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det.",
"External Storage" => "Ekstern lagring",
"Folder name" => "Mappenavn",
"External storage" => "Ekstern lagringsplass",
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index e1dce4b399..43ad018049 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -13,5 +13,6 @@
"{count} files" => "{count} filer",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
"Restore" => "Gjenopprett",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Deleted Files" => "Slettet filer"
);
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index c90d8fe712..7c72cc8e63 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -72,6 +72,7 @@
"Email Field" => "E-mail",
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "VacÃo para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nombre de usuario interno",
"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 4027cb8851..48bcbdf589 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -78,8 +78,10 @@
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
"Internal Username Attribute:" => "Attributo nome utente interno:",
"Override UUID detection" => "Ignora rilevamento UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
"UUID Attribute:" => "Attributo UUID:",
"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test.",
"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
"Test Configuration" => "Prova configurazione",
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 9a296337a0..61e06ea4d9 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# ordenet <roberto@ordenet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 22:50+0000\n"
-"Last-Translator: ordenet <roberto@ordenet.com>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:50+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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"
@@ -343,7 +344,7 @@ msgstr "VacÃo para el nombre de usuario (por defecto). En otro caso, especifiqu
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Nombre de usuario interno"
#: templates/settings.php:102
msgid ""
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 4fcd61af4c..f89b59caad 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:40+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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"
@@ -217,7 +218,7 @@ msgstr "{count} archivos"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index ad3097053d..fdf454a85e 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Error al autenticar"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "El nombre mostrado fue cambiado"
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 152848c3bf..df7f35c828 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:22+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 71fdca5443..4245330eb1 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 6bd8dcce9a..7fa5301fd9 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index aeafcdb309..14033bcc2c 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 64e3b10980..3e03f7b349 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index aac7e9ce16..3091e2a39f 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 9009790625..51be74320b 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index bf15d74fff..cebca82b59 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.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-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +41,19 @@ msgstr "Applicazioni"
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "I file devono essere scaricati uno alla volta."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Torna ai file"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "I file selezionati sono troppo grandi per generare un file zip."
@@ -172,13 +172,13 @@ msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome utente e/o password MS SQL non validi: %s"
-#: setup.php:858
+#: setup.php:859
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
-#: setup.php:859
+#: setup.php:860
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b7c03047e9..ca626d4fa3 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 56a5866b21..294dede933 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-19 01:58+0200\n"
-"PO-Revision-Date: 2013-05-18 06:20+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -378,7 +378,7 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
#: templates/settings.php:106
msgid "UUID Attribute:"
@@ -401,7 +401,7 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index f88d74e447..705336024c 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:22+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 948b6d50f4..f1431fbd1f 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:00+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +21,12 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Kunne ikke flytte %s"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
@@ -38,7 +39,7 @@ msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
#: ajax/upload.php:29
msgid ""
@@ -64,11 +65,11 @@ msgstr "Klarte ikke å skrive til disk"
#: ajax/upload.php:51
msgid "Not enough storage available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
#: ajax/upload.php:83
msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig katalog."
#: appinfo/app.php:12
msgid "Files"
@@ -120,7 +121,7 @@ msgstr "angre"
#: js/filelist.js:331
msgid "perform delete operation"
-msgstr ""
+msgstr "utfør sletting"
#: js/filelist.js:413
msgid "1 file uploading"
@@ -132,11 +133,11 @@ msgstr "filer lastes opp"
#: js/files.js:52
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' er et ugyldig filnavn."
#: js/files.js:56
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Filnavn kan ikke være tomt."
#: js/files.js:64
msgid ""
@@ -146,17 +147,17 @@ msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke ti
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
#: js/files.js:231
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr ""
+msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -164,7 +165,7 @@ msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes
#: js/files.js:277
msgid "Not enough space available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
#: js/files.js:317
msgid "Upload cancelled."
@@ -181,7 +182,7 @@ msgstr "URL-en kan ikke være tom."
#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
msgid "Error"
@@ -217,11 +218,11 @@ msgstr "{count} filer"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
#: lib/app.php:73
msgid "Unable to rename file"
-msgstr ""
+msgstr "Kan ikke gi nytt navn"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -277,7 +278,7 @@ msgstr "Fra link"
#: templates/index.php:42
msgid "Deleted files"
-msgstr ""
+msgstr "Slettet filer"
#: templates/index.php:48
msgid "Cancel upload"
@@ -285,7 +286,7 @@ msgstr "Avbryt opplasting"
#: templates/index.php:54
msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du har ikke skrivetilgang her."
#: templates/index.php:61
msgid "Nothing in here. Upload something!"
@@ -319,4 +320,4 @@ msgstr "Pågående skanning"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Oppgraderer filsystemets mellomlager..."
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 00e13b6447..476b81ff07 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 12:20+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,31 +32,31 @@ msgstr "Gi tilgang"
#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet."
#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Feil med konfigurering av Google Drive"
#: lib/config.php:431
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det."
#: lib/config.php:434
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det."
#: lib/config.php:437
msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 2624ba4719..9ee75563d8 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 12:10+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -81,4 +82,4 @@ msgstr "Slett"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "Slettet filer"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1b6be2e344..38770e18e4 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr "Apper"
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP-nedlasting av avslått"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Filene må lastes ned en om gangen"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Tilbake til filer"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
@@ -172,16 +172,16 @@ msgstr ""
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:859
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
-#: setup.php:859
+#: setup.php:860
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
#: template.php:113
msgid "seconds ago"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 6095b96de5..2f581ebbee 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hans Nesse <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,15 +25,15 @@ msgstr "Lasting av liste fra App Store feilet."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
+msgstr "Autentiseringsfeil"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Ditt visningsnavn er blitt endret."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr ""
+msgstr "Kunne ikke endre visningsnavn"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -72,7 +73,7 @@ msgstr "Ugyldig forespørsel"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Admin kan ikke flytte seg selv fra admingruppen"
#: ajax/togglegroups.php:30
#, php-format
@@ -86,11 +87,11 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr ""
+msgstr "Kunne ikke oppdatere app."
#: js/apps.js:30
msgid "Update to {appversion}"
-msgstr ""
+msgstr "Oppdater til {appversion}"
#: js/apps.js:36 js/apps.js:76
msgid "Disable"
@@ -102,7 +103,7 @@ msgstr "Aktiver"
#: js/apps.js:55
msgid "Please wait...."
-msgstr ""
+msgstr "Vennligst vent..."
#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
msgid "Error"
@@ -110,15 +111,15 @@ msgstr "Feil"
#: js/apps.js:90
msgid "Updating...."
-msgstr ""
+msgstr "Oppdaterer..."
#: js/apps.js:93
msgid "Error while updating app"
-msgstr ""
+msgstr "Feil ved oppdatering av app"
#: js/apps.js:96
msgid "Updated"
-msgstr ""
+msgstr "Oppdatert"
#: js/personal.js:118
msgid "Saving..."
@@ -134,7 +135,7 @@ msgstr "angre"
#: js/users.js:79
msgid "Unable to remove user"
-msgstr ""
+msgstr "Kunne ikke slette bruker"
#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
@@ -151,19 +152,19 @@ msgstr "Slett"
#: js/users.js:269
msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
#: js/users.js:420
msgid "A valid username must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig brukernavn"
#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av bruker"
#: js/users.js:426
msgid "A valid password must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig passord"
#: personal.php:35 personal.php:36
msgid "__language_name__"
@@ -180,36 +181,36 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde."
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+msgstr "Installasjonsadvarsel"
#: 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 "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulen 'fileinfo' mangler"
#: 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 modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
#: templates/admin.php:58
msgid "Locale not working"
-msgstr ""
+msgstr "Språk virker ikke"
#: templates/admin.php:63
#, php-format
@@ -217,11 +218,11 @@ msgid ""
"This ownCloud server can't set system locale to %s. This means that there "
"might be problems with certain characters in file names. We strongly suggest"
" to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s."
#: templates/admin.php:75
msgid "Internet connection not working"
-msgstr ""
+msgstr "Ingen internettilkopling"
#: templates/admin.php:78
msgid ""
@@ -231,7 +232,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 "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud."
#: templates/admin.php:92
msgid "Cron"
@@ -239,19 +240,19 @@ msgstr "Cron"
#: templates/admin.php:101
msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Utfør en oppgave med hver side som blir lastet"
#: templates/admin.php:111
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 er registrert som webcron-tjeneste. Kjør cron.php siden i ownCloud rot hvert minutt vha http."
#: templates/admin.php:121
msgid ""
"Use systems cron service. Call the cron.php file in the owncloud folder via "
"a system cronjob once a minute."
-msgstr ""
+msgstr "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt."
#: templates/admin.php:128
msgid "Sharing"
@@ -259,11 +260,11 @@ msgstr "Deling"
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver API for Deling"
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillat apps å bruke API for Deling"
#: templates/admin.php:142
msgid "Allow links"
@@ -275,7 +276,7 @@ msgstr "Tillat brukere å dele filer med lenker"
#: templates/admin.php:150
msgid "Allow resharing"
-msgstr ""
+msgstr "TIllat videredeling"
#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
@@ -291,22 +292,22 @@ msgstr "Tillat kun deling med andre brukere i samme gruppe"
#: templates/admin.php:168
msgid "Security"
-msgstr ""
+msgstr "Sikkerhet"
#: templates/admin.php:181
msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Tving HTTPS"
#: templates/admin.php:182
msgid ""
"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Tvinger klienter til å bruke ownCloud via kryptert tilkopling."
#: templates/admin.php:185
msgid ""
"Please connect to this ownCloud instance via HTTPS to enable or disable the "
"SSL enforcement."
-msgstr ""
+msgstr "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL."
#: templates/admin.php:195
msgid "Log"
@@ -336,7 +337,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:11
msgid "Add your App"
@@ -356,7 +357,7 @@ msgstr "Se applikasjonens side på apps.owncloud.org"
#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
#: templates/apps.php:38
msgid "Update"
@@ -372,15 +373,15 @@ msgstr "Administratordokumentasjon"
#: templates/help.php:9
msgid "Online Documentation"
-msgstr ""
+msgstr "Online dokumentasjon"
#: templates/help.php:11
msgid "Forum"
-msgstr ""
+msgstr "Forum"
#: templates/help.php:14
msgid "Bugtracker"
-msgstr ""
+msgstr "Feilsporing"
#: templates/help.php:17
msgid "Commercial Support"
@@ -397,7 +398,7 @@ msgstr "Få dine apps til å synkronisere dine filer"
#: templates/personal.php:26
msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
msgid "Password"
@@ -425,7 +426,7 @@ msgstr "Endre passord"
#: templates/personal.php:56 templates/users.php:76
msgid "Display Name"
-msgstr ""
+msgstr "Visningsnavn"
#: templates/personal.php:68
msgid "Email"
@@ -453,11 +454,11 @@ msgstr "WebDAV"
#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
#: templates/users.php:21 templates/users.php:75
msgid "Login Name"
-msgstr ""
+msgstr "Logginn navn"
#: templates/users.php:30
msgid "Create"
@@ -465,11 +466,11 @@ msgstr "Opprett"
#: templates/users.php:33
msgid "Default Storage"
-msgstr ""
+msgstr "Standard lager"
#: templates/users.php:39 templates/users.php:133
msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrenset"
#: templates/users.php:57 templates/users.php:148
msgid "Other"
@@ -477,16 +478,16 @@ msgstr "Annet"
#: templates/users.php:82
msgid "Storage"
-msgstr ""
+msgstr "Lager"
#: templates/users.php:93
msgid "change display name"
-msgstr ""
+msgstr "endre visningsnavn"
#: templates/users.php:97
msgid "set new password"
-msgstr ""
+msgstr "sett nytt passord"
#: templates/users.php:128
msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c2f050d2cc..9ce6141ee5 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-05-19 01:59+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 841c54afcb..45144e5210 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 6403f79b4c..55d62cb0db 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 34004b3c71..5e73703c00 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d1b8054bd9..106b00f6e1 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 25038ad33f..8d59602293 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 6b4d1528f6..42f2f40f85 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 2cf50f6f59..75b29f2f96 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-05-19 01:59+0200\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index ece0283549..8068e286a0 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-05-19 01:59+0200\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 3f6f457e47..27d8ac465c 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 1ffa7770df..9d4c2afdd7 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-05-19 01:58+0200\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index fc95561d3b..23146154c7 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -15,6 +15,8 @@
"Files" => "Filer",
"Text" => "Tekst",
"Images" => "Bilder",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
"seconds ago" => "sekunder siden",
"1 minute ago" => "1 minutt siden",
"%d minutes ago" => "%d minutter siden",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f6e378177a..f7eb7dd5c2 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error al autenticar",
+"Your display name has been changed." => "El nombre mostrado fue cambiado",
"Unable to change display name" => "No fue posible cambiar el nombre mostrado",
"Group already exists" => "El grupo ya existe",
"Unable to add group" => "No fue posible añadir el grupo",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index fbb35baa74..9f18bf472a 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,6 +1,8 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
-"Authentication error" => "Autentikasjonsfeil",
+"Authentication error" => "Autentiseringsfeil",
+"Your display name has been changed." => "Ditt visningsnavn er blitt endret.",
+"Unable to change display name" => "Kunne ikke endre visningsnavn",
"Group already exists" => "Gruppen finnes allerede",
"Unable to add group" => "Kan ikke legge til gruppe",
"Could not enable app. " => "Kan ikke aktivere app.",
@@ -10,53 +12,100 @@
"Unable to delete user" => "Kan ikke slette bruker",
"Language changed" => "Språk endret",
"Invalid request" => "Ugyldig forespørsel",
+"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
+"Couldn't update app." => "Kunne ikke oppdatere app.",
+"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå avBehandle ",
"Enable" => "Aktiver",
+"Please wait...." => "Vennligst vent...",
"Error" => "Feil",
+"Updating...." => "Oppdaterer...",
+"Error while updating app" => "Feil ved oppdatering av app",
+"Updated" => "Oppdatert",
"Saving..." => "Lagrer...",
"deleted" => "slettet",
"undo" => "angre",
+"Unable to remove user" => "Kunne ikke slette bruker",
"Groups" => "Grupper",
"Group Admin" => "Gruppeadministrator",
"Delete" => "Slett",
+"add group" => "legg til gruppe",
+"A valid username must be provided" => "Oppgi et gyldig brukernavn",
+"Error creating user" => "Feil ved oppretting av bruker",
+"A valid password must be provided" => "Oppgi et gyldig passord",
"__language_name__" => "__language_name__",
"Security Warning" => "Sikkerhetsadvarsel",
+"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." => "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde.",
+"Setup Warning" => "Installasjonsadvarsel",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+"Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+"Locale not working" => "Språk virker ikke",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s.",
+"Internet connection not working" => "Ingen internettilkopling",
+"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." => "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud.",
"Cron" => "Cron",
+"Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden i ownCloud rot hvert minutt vha http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt.",
"Sharing" => "Deling",
+"Enable Share API" => "Aktiver API for Deling",
+"Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
"Allow links" => "Tillat lenker",
"Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
+"Allow resharing" => "TIllat videredeling",
"Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
"Allow users to share with anyone" => "Tillat brukere å dele med alle",
"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
+"Security" => "Sikkerhet",
+"Enforce HTTPS" => "Tving HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvinger klienter til å bruke ownCloud via kryptert tilkopling.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL.",
"Log" => "Logg",
"Log level" => "Loggnivå",
"More" => "Mer",
"Less" => "Mindre",
"Version" => "Versjon",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Legg til din App",
"More Apps" => "Flere Apps",
"Select an App" => "Velg en app",
"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
"Update" => "Oppdater",
"User Documentation" => "Brukerdokumentasjon",
"Administrator Documentation" => "Administratordokumentasjon",
+"Online Documentation" => "Online dokumentasjon",
+"Forum" => "Forum",
+"Bugtracker" => "Feilsporing",
"Commercial Support" => "Kommersiell støtte",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
"Get the apps to sync your files" => "Få dine apps til å synkronisere dine filer",
+"Show First Run Wizard again" => "Vis \"Førstegangs veiveiseren\" på nytt",
"Password" => "Passord",
"Your password was changed" => "Passord har blitt endret",
"Unable to change your password" => "Kunne ikke endre passordet ditt",
"Current password" => "Nåværende passord",
"New password" => "Nytt passord",
"Change password" => "Endre passord",
+"Display Name" => "Visningsnavn",
"Email" => "Epost",
"Your email address" => "Din e-postadresse",
"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
"Language" => "Språk",
"Help translate" => "Bidra til oversettelsen",
"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressen for å kople til ownCloud i din filbehandler",
+"Login Name" => "Logginn navn",
"Create" => "Opprett",
-"Other" => "Annet"
+"Default Storage" => "Standard lager",
+"Unlimited" => "Ubegrenset",
+"Other" => "Annet",
+"Storage" => "Lager",
+"change display name" => "endre visningsnavn",
+"set new password" => "sett nytt passord",
+"Default" => "Standard"
);
--
GitLab
From 27a5132b46df56dae81799e05bfeeaff27f2e4bb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 May 2013 09:44:31 +0200
Subject: [PATCH 256/304] Don't set image path in template.
---
core/js/oc-dialogs.js | 2 +-
core/templates/filepicker.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index e05b3b0207..316a99592f 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -283,10 +283,10 @@ var OCdialogs = {
$li = self.$listTmpl.octemplate({
type: entry.type,
dir: dir,
- imgsrc: entry.mimetype_icon,
filename: entry.name,
date: OC.mtime2date(entry.mtime)
});
+ $li.find('img').attr('src', entry.mimetype_icon);
self.$filelist.append($li);
});
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
index 2b7942bd46..e761fbdb56 100644
--- a/core/templates/filepicker.html
+++ b/core/templates/filepicker.html
@@ -2,7 +2,7 @@
<span class="dirtree"></span>
<ul class="filelist">
<li data-entryname="{filename}" data-type="{type}">
- <img src="{imgsrc}" />
+ <img />
<span class="filename">{filename}</span>
<span class="date">{date}</span>
</li>
--
GitLab
From 38b2d0a8229439ea4641e39fcd9275cbf82680ee Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 May 2013 09:54:43 +0200
Subject: [PATCH 257/304] Remove more obsolete code.
---
core/js/oc-dialogs.js | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 316a99592f..e1d3657724 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -173,22 +173,10 @@ var OCdialogs = {
}];
break;
case OCdialogs.OK_BUTTON:
- var functionToCall;
- switch(dialog_type) {
- case 'prompt':
- buttonlist[1] = {
- text: t('core', 'Cancel'),
- click: function() { $(dialog_id).dialog('close'); }
- };
- functionToCall = function() { OCdialogs._promptOkHandler(callback, dialog_id); };
- break;
- default:
- functionToCall = function() {
- $(dialog_id).dialog('close');
- if(callback !== undefined) { callback() };
- };
- break;
- }
+ var functionToCall = function() {
+ $(dialog_id).dialog('close');
+ if(callback !== undefined) { callback() };
+ };
buttonlist[0] = {
text: t('core', 'Ok'),
click: functionToCall
@@ -254,10 +242,6 @@ var OCdialogs = {
}
},
- _promptOkHandler: function(callback, dialog_id) {
- $(dialog_id).dialog('close');
- if (callback !== undefined) { callback($(dialog_id + ' input#oc-dialog-prompt-input').val()) };
- },
/**
* fills the filepicker with files
*/
--
GitLab
From b1bb899867b787f024c94ae26907b857e203d59c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 May 2013 10:16:07 +0200
Subject: [PATCH 258/304] Add rename() method to OC_VCategories.
---
lib/vcategories.php | 32 ++++++++++++++++++++++++++++++++
tests/lib/vcategories.php | 10 ++++++++++
2 files changed, 42 insertions(+)
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 5975e688b7..74864704e3 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -324,6 +324,38 @@ class OC_VCategories {
return $id;
}
+ /**
+ * @brief Rename category.
+ * @param string $from The name of the existing category
+ * @param string $to The new name of the category.
+ * @returns bool
+ */
+ public function rename($from, $to) {
+ $id = $this->array_searchi($from, $this->categories);
+ if($id === false) {
+ OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG);
+ return false;
+ }
+
+ $sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? '
+ . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
+ try {
+ $stmt = OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($to, $this->user, $this->type, $id));
+ if (OC_DB::isError($result)) {
+ echo 'DB error: ' . $result . "\n";
+ OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
+ return false;
+ }
+ } catch(Exception $e) {
+ OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ OCP\Util::ERROR);
+ return false;
+ }
+ $this->categories[$id] = $to;
+ return true;
+ }
+
/**
* @brief Add a new category.
* @param $names A string with a name or an array of strings containing
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index e79dd49870..a8af6ae9f7 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -81,6 +81,16 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
}
+ public function testrenameCategory() {
+ $defcategories = array('Friends', 'Family', 'Wrok', 'Other');
+ $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
+
+ $this->assertTrue($catmgr->rename('Wrok', 'Work'));
+ $this->assertTrue($catmgr->hasCategory('Work'));
+ $this->assertFalse($catmgr->hasCategory('Wrok'));
+
+ }
+
public function testAddToCategory() {
$objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
--
GitLab
From c38dc3666532199a40d78b647d10c62af4496246 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 May 2013 13:56:57 +0200
Subject: [PATCH 259/304] Remove debug output
---
lib/vcategories.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 74864704e3..91c72d5dfa 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -343,7 +343,6 @@ class OC_VCategories {
$stmt = OCP\DB::prepare($sql);
$result = $stmt->execute(array($to, $this->user, $this->type, $id));
if (OC_DB::isError($result)) {
- echo 'DB error: ' . $result . "\n";
OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
return false;
}
--
GitLab
From 946740a71f9f48df8afb69852688c3e5c28b213f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 20 May 2013 13:57:18 +0200
Subject: [PATCH 260/304] Add test for renaming non-existing category.
---
tests/lib/vcategories.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index a8af6ae9f7..df5f600f20 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -88,6 +88,7 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
$this->assertTrue($catmgr->rename('Wrok', 'Work'));
$this->assertTrue($catmgr->hasCategory('Work'));
$this->assertFalse($catmgr->hasCategory('Wrok'));
+ $this->assertFalse($catmgr->rename('Wrok', 'Work'));
}
--
GitLab
From ec475cbcfa04969a58dd3a17d380106074ddbc8b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 20 May 2013 10:21:13 -0400
Subject: [PATCH 261/304] Add data-dir attribute to home breadcrumb
---
apps/files/templates/part.breadcrumb.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 7ea1755d1d..9886b42e42 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,5 +1,5 @@
<?php if(count($_["breadcrumb"])):?>
- <div class="crumb">
+ <div class="crumb" data-dir=''>
<a href="<?php print_unescaped($_['baseURL']); ?>">
<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
</a>
--
GitLab
From 09ff46eda2a538d4f7a41b7f71ebf0e7df8944f2 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 20 May 2013 10:21:55 -0400
Subject: [PATCH 262/304] Remove user name addition to paths in deleteAll
---
lib/files/storage/common.php | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index e87fe3b523..3da13ac4df 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -138,27 +138,21 @@ abstract class Common implements \OC\Files\Storage\Storage {
*/
public function deleteAll($directory, $empty = false) {
$directory = trim($directory, '/');
-
- if (!$this->file_exists(\OCP\USER::getUser() . '/' . $directory)
- || !$this->is_dir(\OCP\USER::getUser() . '/' . $directory)
- ) {
- return false;
- } elseif (!$this->isReadable(\OCP\USER::getUser() . '/' . $directory)) {
+ if (!$this->is_dir($directory) || !$this->isReadable($directory)) {
return false;
} else {
- $directoryHandle = $this->opendir(\OCP\USER::getUser() . '/' . $directory);
+ $directoryHandle = $this->opendir($directory);
while ($contents = readdir($directoryHandle)) {
- if ($contents != '.' && $contents != '..') {
- $path = $directory . "/" . $contents;
+ if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
+ $path = $directory . '/' . $contents;
if ($this->is_dir($path)) {
$this->deleteAll($path);
} else {
- $this->unlink(\OCP\USER::getUser() . '/' . $path); // TODO: make unlink use same system path as is_dir
+ $this->unlink($path);
}
}
}
- //$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
- if ($empty == false) {
+ if ($empty === false) {
if (!$this->rmdir($directory)) {
return false;
}
--
GitLab
From 171b9a4702efb6e413e13e705bb903772950c488 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 21:19:28 +0200
Subject: [PATCH 263/304] added legacy encryption test
---
.../tests/legacy-encrypted-text.txt | Bin 3360 -> 24 bytes
apps/files_encryption/tests/util.php | 49 ++++++++++++++++--
2 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/apps/files_encryption/tests/legacy-encrypted-text.txt b/apps/files_encryption/tests/legacy-encrypted-text.txt
index cb5bf50550d91842c8a0bd214edf9569daeadc48..d38cb7d1b0dc6c45f755c81887f7e0887e436624 100644
GIT binary patch
literal 24
gcmd;GeSfMvH|wO5t9o0POiu}RD6!<`_z~y@0DN`{p8x;=
literal 3360
zcmXw*_dgVlAIF^#&dQ8V;*3s6r!zj3bymjNJ2E5d2pK2q<dBnj*)w}(ud+E(D0`3V
zY%+4l_<n!!7rbAO$NTwuzTfXsty=QvpQMPI)5!#J)X9ba{RU26Z5E<hsPW)@5V+}a
z?<w4f9VsF>V8@Fd8~lKcGMxckFp=W&Z&lG`Cl?qvq{7g*T22nF6ox6|S<d=d$u8ck
z^EJiUpQZUMt4PVLuda*Kc)aaUYGtdn2Qf0CUza5FKnHHXr`Fo=ch)eCK1M3lw!o_(
zu1q=bym~z0%E4ywX8iTsFV+XgE_nhsUm<C*f>sasI8LEsos-DQ9aF#yai`s+bS3y;
zP~n~gPaL~TTZh~^y~4|1$r7qeeU{_@!NsMTc~KRVr*kizynmnk<ma}cj^`C%Of=<9
zfV&8nm4pU$EsR(sj@ot<as1?M;LQjbCE;CZkgv~fm?f164HCR(<Y&fdSMsa|J+aiQ
zz$1ra3ll3Z%_@xB=k6i%$<`(cWqiBayA2L9|DHO{0bjS)(~`AM#oTlNDi3oWG2h{o
z!k^>V=~`Fo`k4$+15y&=!O1shrP6Slv8>km%C05-hdr*BoA8wIc~wZ>O;{-y-hbAP
z=z_BE(nj#Y0y70RLPN|^y&9vU_m;-bsEWf$wn|+j22y@?@JsQO$GCTHY?s8oU75`c
zg*Y$P$imS;qfirK@~t^_9HzgHabAaJO^PB96K9BFqyl*5CpH#KCy*t~R$qP1&^Yzq
zk3kXBn;QATNd?CIEFb-T%&$++2@vql1B$+QG{L$YwK8X96viQZKm$^=eL&!3*u!(=
zSpH!7d)q5M0mGO?{yxfQH)DhUP`K(cXD0ttu1#fnE$43Z8mQ<C)@nk@SYs4I5wr7?
zVH(s;an8_7_08km#f302K+Mi*v%`@sp1GJkIJH{rkDn=;!@;7m>K`a9q~jU6T3v!J
zTXF1R1|qdJ^9|f|)#TJcI0zKJ<r1}D(1`5iZ!|3ZNbuzTWVmJ4Yo-BAo?$I1;QM29
ze<~OLEOD>8xK8v=R_gbtjT>ENw*&rbulIRHt4()s?tXkpVevcL`m*8f?Kp17<$~W;
z`y#&MLkL(UG};~QtNiVenZy09^$a&q=bhbBl6$lgqWI?EG>op-caN}{&1D~qOdrV#
zkI=d+BJ;q!6=6rrdXhtbq=2JL;?3L#nv2ck4H_`E%L6>b3{|AveTJA><POsuz?9Gm
zMyk5Q05`wjQ&!*kAH(K3iD_Bq!KdMZ6I@I3oo<kRPN@(v1oH3M^mG4NNAkdv-X+M3
zc3;(&8(Fxd_9cl0oeveoH|qm0z!&oeLBA+A+haOQO(r!?-U0|EbZeEq>qoEKGMmVl
z*c>Ez>rIm<cRim~f%=%bIz6R~_0u0VqJzy~e*aY3kQPjk9bJ*mRk&0mm?GXLdm+W#
zYrF)vMHsNuU=cQZ%s^~x(JcG%mk9rqs!bvDJmyg=h<~UTi`{%tnnTV)ujXIVx3Tke
z^(IF}Ii$)!W3j{naXe}*t@z^$ndj%$t8Pz7@@EnwFBpf(aE=B}$xopZS*@cHFs50}
zi~8K1@u5Bj&+1#>sfclTOW6*Lp>EisY42PsSq^5^huHw@u85!~Vx>+-kClVB<ZZD0
z6@a6p^pk$+4FJ<s6=F<e+#+zFM(&nme=WW-_mvQT1l@E;{vy5!;))xqUZfmZR^9B!
ze#?s;5ATblS^OJZS*-1{_L|cJ?xUjW3DhI=f=-916!0JXG`_{Yc*0XN82p>Dh;IsZ
zo^P=*h}ft;n~{EC>@#C2{$~}yA(88P1vLCO!Cwfq{4j&asg5p>FM3*Gw~^$Qjvab1
ztGH!hA1|sT)G;`@F(vcv0uOpKaNp5b-AM$~GO%2Z6aeP=h(tW`cin!fK3`FpcdD+5
zn@IIkbi@<=exISY?w!racU8NGo?AW|&5hEIh-nKEkmV;n>-X6$hoQKR=V}KcR!PNU
ztW05aR*mv{NO{=Plcpj4f0N4vyG9t$z7DStx<92(y=aEpl_0?smB&j`##X^3lV_RD
zWRBiiN%VGCkKyQBGI&x%C*ciKYSgi5x`;YsvWmYf)#u%xTnMQL8dlmHs-3#1ljGX3
zXJJ%upwIoM@sE1xHKDvO`^f9J&tvwLfHjh<_D->q=&7=slQ}Nr=)(Vdagwyk35-a1
zH0#ABVRy_vuqPfY{X1k^vt^yXER5^JcBLJNX2SODYdo<a0Ojk`vr5P?$Fj5BE}AiW
zh2de~gB&f386jyV)+e5xkgXX?gzDn4Z>kf$=!sHI$7SEn*lzRa->FdOP>-2DrnC^5
zDk0OdTcMBmoQWfJ&8G^)f}<1pV>RB=Qc9#+_63Q{1|qj--iCH4FVoH3D7@ofs!tmT
zMC`41I?=1Htn0LnKP(CSPD@Wb)z=^S`9@Fn{gc^$U8UXnsQRe~2H!Lj-r0`sHH5b=
zm|?rbO)J!aSyX-ktX!#$k<m|j_;+h`{LR9^28XDcs7~kQyB$0DUbamnvBI{n=kZ(!
za?o`hYG6Z+r&kXWrm-yod?+nOI`Un9p(3l|y4_rq;2%D{YIX1Fo|kRH-uNiSgd~A7
ziu&Hg4;>H;YkDSMgQ1OEEURah2CeE{-lmOlw5M7q>S=a4Qe7mmX&P1*WTz~I9JsC1
zeJyl#i9m>Hf=q30Bd}@06AqhuA;#BSgXn|@$lE;CX_P5lk+f=w`qU$@Am&PL*S!4c
zRN22OW|_>C+6>3BR||3(Xhp8LH{hhanRC9!zeyie*rJ~pFSWk*c~61w8`rmL4bBNe
z)pN2+z?LKc#n3Dtbu-_E9i7lHx%3FweIp3xJDtqaQ!&B8c&`P_P}W8p0-iM`*m^y`
zR~nAO(0&Qd#F%hm6cH?FEm`sl?T$J|%lFO|n6t1&**a#DucE2!HLutGIac3V{vn?!
z(&SbH#~gfZ=qw*lX7C9IExH{=uo22;$TdzAs9BW~AS)(niq!$R6MuDmf4PL5De5)_
z5zdpWK02EWi~q4XdcW?W2Yks0zoXgyiFTfy{bR-jyfQbld<Sp)CJFy&_iJSEMVk4l
zwJOTxV&^@D6#7F5k6f-8{2gEe+e@x?e{!y0GmwrAG7eoz4jdDz+$1-n;NhgWN;Ht3
z<93)7q=Q2@(aS`uv_-FpcZsAswZ^2Z9BMHzKLzrV+OrT+MkK0wut&*yw2E#6M8LYM
z0Sa-&RS<I~f0Kn6$>Uaxctg|A3gOeridX2Y{<NfR#8<^(Sjwl(;UC{y)~3<jhVVTR
zNy7uYRf%T*ui4(zZAq_@KL-oC-Hwd7y%^Y@4tG-$lqu|Ds*Kr4Wr84=;Itv~o!3&;
z<X>w8(G(WAS=x8%{JyLovPe06_FrqH6856a!ez@Guv#_ftsb?d<hXF@r*Ts-{)3b;
z0K~912=p{X`<!3*kX#B_7O#V{WVRts=kXWcN~sq&7m_F;O`zSbjPl|2kG9cNu$6lP
zk(X?O0Z2wMkfNqwO{0?@4FtKN97`)M9ylWD_;AHB27D(y@cz9UcvB1GxPrR^1+Mkp
z-a1DuxO1RWT<aA8s*~6hTPOVXPX?+2dMs8FZh4#w_@WZDLO~Uuv<}<}?r<roPlWj0
zP=v8?-hHgEK`YP8FTcB6E?2_lEXaeCHP3{?1oVoCDAX-)vp5z;e{0_zOFR6b-p{_N
zZ!Q>xtiKHN7nr-=M0<l9nfu(=UPyh5BX0K4f10YKyA?K@jsg_`yaF2p0Up7fkl+2L
zlo@&-o3X<Cao6|q435oRKY6@`NOhkv-lTm2_4g*PtvJ^sXpN|=Kq*9zdNMCi>^pU&
zSI=;>Hliyt3F7v1sN(}F9@@P;0Uhs!Ay&bDd}tz+%hlItxwoT6_l5Fulw(ZQVZxy}
zXJk2(s`GL8@}Mfuj)u11vRF8UR`2I31zQk=vsx|ri>uZ3J_<5lqLfZlTlu`afO0b7
zctIKRm#(5XzU%zU$<VP1p|p@O-x417CEVRIzZ{N<C)A+NGslvGRTHyLT=_-iRZDqK
z=6s^J5)0$5|BKlSR;B}t=)-IeFe*mNyJQ@*aj`ri_=4d|AKQ|MpQUH@pemOhjlmX3
z>bfd6Geoj$j*8?vIA7<)QfTP-7;LHUtet+GO2eJS-HkGhxuWD29(6TlL{qhT)T>lV
zZ<v8719HHY0(6$ihi{8*stPibroGR|w0~8texb_lnPkP)g*0R61J)!R%)WlYB%<ci
znNrHxg0^^0+MIA)<6H6KHkRECOVy-$S#e5mrglhH7wYke;G<K7W_^HqkFvZP>~kI<
zCx*YfkY%u-s43Rym5J;$4H4z{clZ+VO&`CJW<PQt5xK3XXT~JO_>#7jP?AQ1wR^U+
TWaK9_8%OLm9CpY~&*%LQ#;b)=
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 57ec395342..667ee24f04 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -38,6 +38,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
*/
public $util;
public $dataShort;
+ public $legacyEncryptedData;
+ public $legacyEncryptedDataKey;
+ public $lagacyKey;
function setUp()
{
@@ -54,6 +57,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->lagacyKey = '62829813025828180801';
$keypair = Encryption\Crypt::createKeypair();
@@ -100,7 +105,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
*/
function testKeyPaths()
{
-
$util = new Encryption\Util($this->view, $this->userId);
$this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
@@ -116,7 +120,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
*/
function testSetupServerSide()
{
-
$this->assertEquals(true, $this->util->setupServerSide($this->pass));
}
@@ -125,10 +128,50 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
*/
function testUserIsReady()
{
-
$this->assertEquals(true, $this->util->ready());
}
+ /**
+ * @brief test checking whether account is not ready for encryption,
+ */
+ function testUserIsNotReady()
+ {
+ $this->view->unlink($this->publicKeyDir);
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ $this->assertFalse(OCA\Encryption\Hooks::login($params));
+
+ $this->view->unlink($this->privateKeyPath);
+ }
+
+ /**
+ * @brief test checking whether account is not ready for encryption,
+ */
+ function testIsLagacyUser()
+ {
+ $userView = new \OC_FilesystemView( '/' . $this->userId );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+ $userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+
+ $util = new Encryption\Util($this->view, $this->userId);
+ $util->setMigrationStatus(0);
+
+ $this->assertTrue(OCA\Encryption\Hooks::login($params));
+
+ $this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
+ }
+
function testRecoveryEnabledForUser()
{
--
GitLab
From 8e0540d0e45db9470ff0d17869bab6df41bd389a Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 21:22:03 +0200
Subject: [PATCH 264/304] key creation should never override a private or
public key
---
apps/files_encryption/lib/util.php | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 9ba7b3b3a3..8147982d48 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -212,9 +212,10 @@ class Util
}
// Create user keypair
+ // we should never override a keyfile
if (
!$this->view->file_exists($this->publicKeyPath)
- or !$this->view->file_exists($this->privateKeyPath)
+ && !$this->view->file_exists($this->privateKeyPath)
) {
// Generate keypair
@@ -233,6 +234,15 @@ class Util
\OC_FileProxy::$enabled = true;
+ } else {
+ // check if public-key exists but private-key is missing
+ if($this->view->file_exists($this->publicKeyPath) && !$this->view->file_exists($this->privateKeyPath)) {
+ \OC_Log::write('Encryption library', 'public key exists but private key is missing for "' . $this->userId . '"', \OC_Log::FATAL);
+ return false;
+ } else if(!$this->view->file_exists($this->publicKeyPath) && $this->view->file_exists($this->privateKeyPath)) {
+ \OC_Log::write('Encryption library', 'private key exists but public key is missing for "' . $this->userId . '"', \OC_Log::FATAL);
+ return false;
+ }
}
// If there's no record for this user's encryption preferences
--
GitLab
From 1fa2f19ee44cc4a25bda784aee46ab2dac28e658 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 21:24:39 +0200
Subject: [PATCH 265/304] removed dead code for delShareKey
---
apps/files_encryption/hooks/hooks.php | 26 ++++++------------------
apps/files_encryption/lib/keymanager.php | 26 ++++++++----------------
2 files changed, 15 insertions(+), 37 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 087ba3d893..90a93b4c52 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -67,13 +67,13 @@ class Hooks {
// If migration not yet done
if ( ! $migrationCompleted ) {
- $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+ $userView = new \OC_FilesystemView( '/' . $params['uid'] );
// Set legacy encryption key if it exists, to support
// depreciated encryption system
- if (
- $view1->file_exists( 'encryption.key' )
- && $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
+ if (
+ $userView->file_exists( 'encryption.key' )
+ && $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
) {
$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
@@ -412,25 +412,11 @@ class Hooks {
// Unshare every user who no longer has access to the file
$delUsers = array_diff( $userIds, $sharingUsers);
-
- if ( !Keymanager::delShareKey( $view, $delUsers, $path ) ) {
-
- $failed[] = $path;
-
- }
+ // delete share key
+ Keymanager::delShareKey( $view, $delUsers, $path );
}
- // If no attempts to set keyfiles failed
- if ( empty( $failed ) ) {
-
- return true;
-
- } else {
-
- return false;
-
- }
}
}
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 1bc334e7a1..542b1cf287 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -540,32 +540,23 @@ class Keymanager
$shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
- $result = false;
-
if ($view->is_dir($shareKeyPath)) {
- $localPath = \OC_Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
- $result = self::recursiveDelShareKeys($localPath, $userIds);
+ $localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
+ self::recursiveDelShareKeys($localPath, $userIds);
} else {
foreach ($userIds as $userId) {
- $view->unlink($shareKeyPath . '.' . $userId . '.shareKey');
- }
-
- $result = true;
- }
-
- if (!$result) {
- \OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR);
+ if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
+ \OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR);
+ }
+ }
}
\OC_FileProxy::$enabled = $proxyStatus;
-
- return $result;
-
}
/**
@@ -582,13 +573,14 @@ class Keymanager
}
/** @var $matches array */
foreach ($matches as $ma) {
- unlink($ma);
+ if (!unlink($ma)) {
+ \OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR);
+ }
}
$subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
foreach ($subdirs as $subdir) {
self::recursiveDelShareKeys($subdir, $userIds);
}
- return true;
}
/**
--
GitLab
From 1c8e5d6873b1190d73b4139ca9fd7e710ae5d1a3 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 21:46:28 +0200
Subject: [PATCH 266/304] added test for failed sharing
---
apps/files_encryption/hooks/hooks.php | 4 +-
apps/files_encryption/tests/crypt.php | 2 +
apps/files_encryption/tests/encryption.key | 1 +
apps/files_encryption/tests/share.php | 64 ++++++++++++++++++++++
4 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 apps/files_encryption/tests/encryption.key
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 90a93b4c52..e319648045 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -208,6 +208,9 @@ class Hooks {
/*
* @brief check if files can be encrypted to every user.
*/
+ /**
+ * @param $params
+ */
public static function preShared($params) {
$users = array();
@@ -229,7 +232,6 @@ class Hooks {
$params['run']->run = false;
// TODO: Make sure files_sharing provides user
// feedback on failed share
- break;
}
}
}
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 5b5a2189a4..6a1f1aef65 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -51,6 +51,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+ $this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
$this->randomKey = Encryption\Crypt::generateKey();
$keypair = Encryption\Crypt::createKeypair();
@@ -884,6 +885,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
// tear down
$view->unlink($filename);
}
+
// function testEncryption(){
//
// $key=uniqid();
diff --git a/apps/files_encryption/tests/encryption.key b/apps/files_encryption/tests/encryption.key
new file mode 100644
index 0000000000..4495cee78e
--- /dev/null
+++ b/apps/files_encryption/tests/encryption.key
@@ -0,0 +1 @@
+ÍÜä°E_cPï 6HþV»sßàÊž
\ No newline at end of file
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index a9ee8d0023..f302aa0a3e 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -691,6 +691,70 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertTrue($util->setRecoveryForUser(0));
}
+ function testFailShareFile()
+ {
+ // login as admin
+ $this->loginHelper('admin');
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertTrue(is_array($fileInfo));
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // break users public key
+ $this->view->rename('/public-keys/user2.public.key', '/public-keys/user2.public.key_backup');
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1', OCP\PERMISSION_ALL);
+
+ // login as admin
+ $this->loginHelper('admin');
+
+ // check if share key for user1 not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // break user1 public key
+ $this->view->rename('/public-keys/user2.public.key_backup', '/public-keys/user2.public.key');
+
+ // remove share file
+ $this->view->unlink('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey');
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // unshare the file with user1
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+
+ // cleanup
+ $this->view->unlink('/admin/files/' . $this->filename);
+ }
+
+
+
/**
* @param $user
* @param bool $create
--
GitLab
From f2b1158addeb53e2c1155228c4372209786a2133 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 23:44:10 +0200
Subject: [PATCH 267/304] improved tests
---
apps/files_encryption/hooks/hooks.php | 15 +++++++----
apps/files_encryption/tests/crypt.php | 39 +++------------------------
2 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e319648045..53afefc721 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -225,15 +225,20 @@ class Hooks {
break;
}
+ $error = false;
foreach ($users as $user) {
if (!$view->file_exists($user . '.public.key')) {
- // Set flag var 'run' to notify emitting
- // script that hook execution failed
- $params['run']->run = false;
- // TODO: Make sure files_sharing provides user
- // feedback on failed share
+ $error = true;
+ break;
}
}
+
+ if($error)
+ // Set flag var 'run' to notify emitting
+ // script that hook execution failed
+ $params['run']->run = false;
+ // TODO: Make sure files_sharing provides user
+ // feedback on failed share
}
/**
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 6a1f1aef65..049f3fb5d9 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -706,41 +706,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->dataLong, $decrypt);
- $newFolder = '/newfolder' . time();
-
- $view->rename($folder, $newFolder);
-
- // Get file decrypted contents
- $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
-
- $this->assertEquals($this->dataLong, $newDecrypt);
-
- // tear down
- $view->unlink($newFolder);
- }
-
- function testRenameFolder()
- {
-
- $filename = '/tmp-' . time();
+ $newFolder = '/newfolder/subfolder' . time();
+ $view->mkdir('/newfolder');
- $folder = '/folder';
- $newFolder = '/newfolder';
- $view = new \OC\Files\View('/' . $this->userId . '/files');
- $view->mkdir($folder);
-
- // Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
-
- // Test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
-
- // Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $folder . $filename);
-
- $this->assertEquals($this->dataLong, $decrypt);
-
- // rename folder
$view->rename($folder, $newFolder);
// Get file decrypted contents
@@ -754,8 +722,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
function testChangePassphrase()
{
-
- $filename = 'tmp-' . time();
+ $filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
--
GitLab
From 4bf840e2cabd6402d2f8f3b67118d6661b0c5833 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 21 May 2013 00:00:55 +0200
Subject: [PATCH 268/304] cleanup unused code optimize tests
---
apps/files_encryption/appinfo/app.php | 3 ---
apps/files_encryption/lib/helper.php | 10 ----------
apps/files_encryption/tests/share.php | 19 +++++++++++++++++--
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index e56d012fee..7d01696e08 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -18,9 +18,6 @@ OCA\Encryption\Helper::registerUserHooks();
// Sharing related hooks
OCA\Encryption\Helper::registerShareHooks();
-// Webdav related hooks
-OCA\Encryption\Helper::registerWebdavHooks();
-
// Filesystem related hooks
OCA\Encryption\Helper::registerFilesystemHooks();
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index c57f0bc009..e4bf2c1226 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -58,16 +58,6 @@ class Helper
\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
}
- /**
- * @brief register webdav related hooks
- *
- */
- public static function registerWebdavHooks()
- {
-
-
- }
-
/**
* @brief register filesystem related hooks
*
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index f302aa0a3e..0b806394eb 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -557,8 +557,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
function testRecoveryFile()
{
- // login as admin
- $this->loginHelper('admin');
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $this->view->unlink('/owncloud_private_key');
+ $this->view->unlink('/public-keys');
+
+ \OC_FileProxy::$enabled = $proxyStatus;
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
@@ -566,6 +572,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// check if control file created
$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
+ // login as admin
+ $this->loginHelper('admin');
+
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
// check if recovery password match
@@ -620,6 +629,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// check if share key for recovery not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+ \OCA\Encryption\Helper::adminDisableRecovery('test123');
+ $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
}
function testRecoveryForUser()
@@ -689,6 +701,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// enable recovery for admin
$this->assertTrue($util->setRecoveryForUser(0));
+
+ \OCA\Encryption\Helper::adminDisableRecovery('test123');
+ $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
}
function testFailShareFile()
--
GitLab
From afdad5c74da5c163b01f43046224b376a23f4e60 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 21 May 2013 02:04:52 +0200
Subject: [PATCH 269/304] [tx-robot] updated from transifex
---
apps/files/l10n/nn_NO.php | 1 +
apps/files_sharing/l10n/nn_NO.php | 3 +++
apps/files_trashbin/l10n/nn_NO.php | 10 +++++++++-
apps/files_versions/l10n/nn_NO.php | 11 ++++++++++
apps/user_ldap/l10n/et_EE.php | 12 +++++++++++
apps/user_ldap/l10n/ja_JP.php | 1 +
l10n/es/core.po | 4 ++--
l10n/et_EE/user_ldap.po | 31 +++++++++++++++--------------
l10n/ja_JP/user_ldap.po | 6 +++---
l10n/nn_NO/files.po | 6 +++---
l10n/nn_NO/files_sharing.po | 13 ++++++------
l10n/nn_NO/files_trashbin.po | 23 +++++++++++----------
l10n/nn_NO/files_versions.po | 25 ++++++++++++-----------
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
24 files changed, 104 insertions(+), 64 deletions(-)
create mode 100644 apps/files_versions/l10n/nn_NO.php
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 2b7c5cf89b..29593b6f2d 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
"Unable to rename file" => "Klarte ikkje endra filnamnet",
"Upload" => "Last opp",
"File handling" => "Filhandtering",
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index abd1ee394b..aeba545dab 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,6 +1,9 @@
<?php $TRANSLATIONS = array(
"Password" => "Passord",
"Submit" => "Send",
+"%s shared the folder %s with you" => "%s delte mappa %s med deg",
+"%s shared the file %s with you" => "%s delte fila %s med deg",
"Download" => "Last ned",
+"No preview available for" => "Inga førehandsvising tilgjengeleg for",
"web services under your control" => "Vev tjenester under din kontroll"
);
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 8166a024e5..454ea2b057 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,10 +1,18 @@
<?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
+"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
+"perform restore operation" => "utfør gjenoppretting",
"Error" => "Feil",
+"delete file permanently" => "slett fila for godt",
"Delete permanently" => "Slett for godt",
"Name" => "Namn",
+"Deleted" => "Sletta",
"1 folder" => "1 mappe",
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
-"Delete" => "Slett"
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
+"Restore" => "Gjenopprett",
+"Delete" => "Slett",
+"Deleted Files" => "Sletta filer"
);
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
new file mode 100644
index 0000000000..940cc2371a
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
+"success" => "vellukka",
+"File %s was reverted to version %s" => "Tilbakestilte fila %s til utgåva %s",
+"failure" => "feil",
+"File %s could not be reverted to version %s" => "Klarte ikkje tilbakestilla fila %s til utgåva %s",
+"No old versions available" => "Ingen eldre utgåver tilgjengelege",
+"No path specified" => "Ingen sti gjeve",
+"Versions" => "Utgåver",
+"Revert a file to a previous version by clicking on its revert button" => "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
+);
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 5f7e048e71..39346def03 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Vastendususte puhastamine ebaõnnestus.",
"Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
"The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
@@ -7,6 +8,7 @@
"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
"Keep settings?" => "Säilitada seadistused?",
"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
+"mappings cleared" => "vastendused puhastatud",
"Success" => "Korras",
"Error" => "Viga",
"Connection test succeeded" => "Ühenduse testimine õnnestus",
@@ -72,6 +74,16 @@
"Email Field" => "Email atribuut",
"User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+"Internal Username" => "Sisemine kasutajanimi",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
+"Override UUID detection" => "Tühista UUID tuvastus",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"UUID Attribute:" => "UUID atribuut:",
+"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
"Test Configuration" => "Testi seadistust",
"Help" => "Abiinfo"
);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 6d5008b65b..53fa9ae697 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -81,6 +81,7 @@
"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトã§ã¯ã€ownCloud 㯠UUID 属性を自動的ã«æ¤œå‡ºã—ã¾ã™ã€‚UUID属性ã¯ã€LDAPユーザã¨LDAPグループを間é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“れを指定ã—ãªã„å ´åˆã¯ã€å†…部ユーザåã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’用ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。空ã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚変更ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPユーザã¨LDAPグループã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
"UUID Attribute:" => "UUID属性:",
"Username-LDAP User Mapping" => "ユーザåã¨LDAPユーザã®ãƒžãƒƒãƒ”ング",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloudã¯ï¼ˆãƒ¡ã‚¿ï¼‰ データã®ä¿å˜ã¨å‰²ã‚Šå½“ã¦ã«ãƒ¦ãƒ¼ã‚¶åを使用ã—ã¾ã™ã€‚ユーザをæ£ç¢ºã«è˜åˆ¥ã—ã¦èªè˜ã™ã‚‹ãŸã‚ã«ã€å€‹ã€…ã®LDAPユーザã¯å†…部ユーザåã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ownCloudユーザåã¨LDAPユーザåã®é–“ã®ãƒžãƒƒãƒ”ングãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã‚’æ„味ã—ã¦ã„ã¾ã™ã€‚生æˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶åã¯ã€LDAPユーザã®UUIDã¨ãƒžãƒƒãƒ”ングã•ã‚Œã¾ã™ã€‚åŠ ãˆã¦ã€DNãŒLDAPã¨ã®ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ã‚·ãƒ§ãƒ³ã‚’削減ã™ã‚‹ãŸã‚ã«ã‚ャッシュã•ã‚Œã¾ã™ãŒã€è˜åˆ¥ã«ã¯åˆ©ç”¨ã•ã‚Œã¾ã›ã‚“。DNãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€å¤‰æ›´ã‚’ownCloudãŒè¦‹ã¤ã‘ã¾ã™ã€‚内部ã®ownCloudåã¯ownCloud全体ã«äº˜ã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚マッピングをクリアã™ã‚‹ã¨ã€ã„ãŸã‚‹ã¨ã“ã‚ã«ä½¿ã‚ã‚Œãªã„ã¾ã¾ã®ç‰©ãŒæ®‹ã‚‹ã§ã—ょã†ã€‚マッピングã®ã‚¯ãƒªã‚¢ã¯è¨å®šã«æ•æ„Ÿã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å…¨ã¦ã®LDAPã®è¨å®šã«å½±éŸ¿ã‚’与ãˆã¾ã™ï¼æœ¬ç•ªã®ç’°å¢ƒã§ã¯æ±ºã—ã¦ãƒžãƒƒãƒ”ングをクリアã—ãªã„ã§ãã ã•ã„。テストもã—ãã¯å®Ÿé¨“ã®æ®µéšŽã§ã®ã¿ãƒžãƒƒãƒ”ングã®ã‚¯ãƒªã‚¢ã‚’è¡Œãªã£ã¦ãã ã•ã„。",
"Clear Username-LDAP User Mapping" => "ユーザåã¨LDAPユーザã®ãƒžãƒƒãƒ”ングをクリアã™ã‚‹",
"Clear Groupname-LDAP Group Mapping" => "グループåã¨LDAPグループã®ãƒžãƒƒãƒ”ングをクリアã™ã‚‹",
"Test Configuration" => "è¨å®šã‚’テスト",
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 2a2a9f9f82..7e587eed77 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 23:10+0000\n"
"Last-Translator: ggam <ggam@brainleakage.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index bb06a54edc..93e601cf3e 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 07:58+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Vastendususte puhastamine ebaõnnestus."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -60,7 +61,7 @@ msgstr "Ei suuda lisada serveri seadistust"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "vastendused puhastatud"
#: js/settings.js:112
msgid "Success"
@@ -343,7 +344,7 @@ msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhu
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Sisemine kasutajanimi"
#: templates/settings.php:102
msgid ""
@@ -359,15 +360,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Sisemise kasutajatunnuse atribuut:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Tühista UUID tuvastus"
#: templates/settings.php:105
msgid ""
@@ -378,15 +379,15 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID atribuut:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
#: templates/settings.php:108
msgid ""
@@ -401,15 +402,15 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index ebb735eb25..4c7f9ca2dc 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 12:20+0000\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 07:58+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -401,7 +401,7 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr ""
+msgstr "ownCloudã¯ï¼ˆãƒ¡ã‚¿ï¼‰ データã®ä¿å˜ã¨å‰²ã‚Šå½“ã¦ã«ãƒ¦ãƒ¼ã‚¶åを使用ã—ã¾ã™ã€‚ユーザをæ£ç¢ºã«è˜åˆ¥ã—ã¦èªè˜ã™ã‚‹ãŸã‚ã«ã€å€‹ã€…ã®LDAPユーザã¯å†…部ユーザåã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ownCloudユーザåã¨LDAPユーザåã®é–“ã®ãƒžãƒƒãƒ”ングãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã‚’æ„味ã—ã¦ã„ã¾ã™ã€‚生æˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶åã¯ã€LDAPユーザã®UUIDã¨ãƒžãƒƒãƒ”ングã•ã‚Œã¾ã™ã€‚åŠ ãˆã¦ã€DNãŒLDAPã¨ã®ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ã‚·ãƒ§ãƒ³ã‚’削減ã™ã‚‹ãŸã‚ã«ã‚ャッシュã•ã‚Œã¾ã™ãŒã€è˜åˆ¥ã«ã¯åˆ©ç”¨ã•ã‚Œã¾ã›ã‚“。DNãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€å¤‰æ›´ã‚’ownCloudãŒè¦‹ã¤ã‘ã¾ã™ã€‚内部ã®ownCloudåã¯ownCloud全体ã«äº˜ã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚マッピングをクリアã™ã‚‹ã¨ã€ã„ãŸã‚‹ã¨ã“ã‚ã«ä½¿ã‚ã‚Œãªã„ã¾ã¾ã®ç‰©ãŒæ®‹ã‚‹ã§ã—ょã†ã€‚マッピングã®ã‚¯ãƒªã‚¢ã¯è¨å®šã«æ•æ„Ÿã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å…¨ã¦ã®LDAPã®è¨å®šã«å½±éŸ¿ã‚’与ãˆã¾ã™ï¼æœ¬ç•ªã®ç’°å¢ƒã§ã¯æ±ºã—ã¦ãƒžãƒƒãƒ”ングをクリアã—ãªã„ã§ãã ã•ã„。テストもã—ãã¯å®Ÿé¨“ã®æ®µéšŽã§ã®ã¿ãƒžãƒƒãƒ”ングã®ã‚¯ãƒªã‚¢ã‚’è¡Œãªã£ã¦ãã ã•ã„。"
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 178e9b6e3d..8bf6b233b5 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 13:00+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgstr "{count} filer"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 94d12c1829..1edc28d346 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 17:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 13:00+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +29,12 @@ msgstr "Send"
#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s delte mappa %s med deg"
#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s delte fila %s med deg"
#: templates/public.php:19 templates/public.php:43
msgid "Download"
@@ -41,7 +42,7 @@ msgstr "Last ned"
#: templates/public.php:40
msgid "No preview available for"
-msgstr ""
+msgstr "Inga førehandsvising tilgjengeleg for"
#: templates/public.php:50
msgid "web services under your control"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 85b5e8f5e9..6abeaf62de 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 11:10+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +21,16 @@ msgstr ""
#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Klarte ikkje sletta %s for godt"
#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Klarte ikkje gjenoppretta %s"
#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
-msgstr ""
+msgstr "utfør gjenoppretting"
#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
msgid "Error"
@@ -37,7 +38,7 @@ msgstr "Feil"
#: js/trash.js:34
msgid "delete file permanently"
-msgstr ""
+msgstr "slett fila for godt"
#: js/trash.js:121
msgid "Delete permanently"
@@ -49,7 +50,7 @@ msgstr "Namn"
#: js/trash.js:175 templates/index.php:27
msgid "Deleted"
-msgstr ""
+msgstr "Sletta"
#: js/trash.js:184
msgid "1 folder"
@@ -69,11 +70,11 @@ msgstr "{count} filer"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Ingenting her. Papirkorga di er tom!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr ""
+msgstr "Gjenopprett"
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
@@ -81,4 +82,4 @@ msgstr "Slett"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "Sletta filer"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 0a5ad71179..925f545edd 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 15:10+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +21,38 @@ msgstr ""
#: ajax/rollbackVersion.php:15
#, php-format
msgid "Could not revert: %s"
-msgstr ""
+msgstr "Klarte ikkje å tilbakestilla: %s"
#: history.php:40
msgid "success"
-msgstr ""
+msgstr "vellukka"
#: history.php:42
#, php-format
msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Tilbakestilte fila %s til utgåva %s"
#: history.php:49
msgid "failure"
-msgstr ""
+msgstr "feil"
#: history.php:51
#, php-format
msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Klarte ikkje tilbakestilla fila %s til utgåva %s"
#: history.php:69
msgid "No old versions available"
-msgstr ""
+msgstr "Ingen eldre utgåver tilgjengelege"
#: history.php:74
msgid "No path specified"
-msgstr ""
+msgstr "Ingen sti gjeve"
#: js/versions.js:6
msgid "Versions"
-msgstr ""
+msgstr "Utgåver"
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 9ce6141ee5..78d60372e1 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 45144e5210..0ab57eb950 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 55d62cb0db..76b4b7293a 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 5e73703c00..7bfc3647dd 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 106b00f6e1..48923f8af3 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 8d59602293..3e9ecd756f 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 42f2f40f85..91f8d60881 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 75b29f2f96..55b22c52c6 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-05-20 02:03+0200\n"
+"POT-Creation-Date: 2013-05-21 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8068e286a0..fe59c434e9 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-05-20 02:05+0200\n"
+"POT-Creation-Date: 2013-05-21 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 27d8ac465c..e14b4cb292 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 9d4c2afdd7..018936d3d9 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-05-20 02:01+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
--
GitLab
From c9e862ccbae4a659d8bb449ec63de1aa4756df28 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 21 May 2013 07:19:23 +0200
Subject: [PATCH 270/304] fix broken tests
---
apps/files_encryption/tests/share.php | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 0b806394eb..849f16c696 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -557,15 +557,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
function testRecoveryFile()
{
- // disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- $this->view->unlink('/owncloud_private_key');
- $this->view->unlink('/public-keys');
-
- \OC_FileProxy::$enabled = $proxyStatus;
-
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
--
GitLab
From 64591cf7547258aa15136329d8ed582701b4107a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 21 May 2013 10:30:24 +0200
Subject: [PATCH 271/304] move 3rdparty dependencies to app
---
.../3rdparty/Crypt_Blowfish/Blowfish.php | 317 +++++++++++++++++
.../Crypt_Blowfish/Blowfish/DefaultKey.php | 327 ++++++++++++++++++
apps/files_encryption/lib/crypt.php | 2 +-
apps/files_encryption/tests/crypt.php | 2 +-
apps/files_encryption/tests/share.php | 2 +-
5 files changed, 647 insertions(+), 3 deletions(-)
create mode 100644 apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
create mode 100644 apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
new file mode 100644
index 0000000000..4ccacb963e
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
@@ -0,0 +1,317 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+require_once 'PEAR.php';
+
+
+/**
+ *
+ * Example usage:
+ * $bf = new Crypt_Blowfish('some secret key!');
+ * $encrypted = $bf->encrypt('this is some example plain text');
+ * $plaintext = $bf->decrypt($encrypted);
+ * echo "plain text: $plaintext";
+ *
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ * @version @package_version@
+ * @access public
+ */
+class Crypt_Blowfish
+{
+ /**
+ * P-Array contains 18 32-bit subkeys
+ *
+ * @var array
+ * @access private
+ */
+ var $_P = array();
+
+
+ /**
+ * Array of four S-Blocks each containing 256 32-bit entries
+ *
+ * @var array
+ * @access private
+ */
+ var $_S = array();
+
+ /**
+ * Mcrypt td resource
+ *
+ * @var resource
+ * @access private
+ */
+ var $_td = null;
+
+ /**
+ * Initialization vector
+ *
+ * @var string
+ * @access private
+ */
+ var $_iv = null;
+
+
+ /**
+ * Crypt_Blowfish Constructor
+ * Initializes the Crypt_Blowfish object, and gives a sets
+ * the secret key
+ *
+ * @param string $key
+ * @access public
+ */
+ function Crypt_Blowfish($key)
+ {
+ if (extension_loaded('mcrypt')) {
+ $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
+ $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
+ }
+ $this->setKey($key);
+ }
+
+ /**
+ * Deprecated isReady method
+ *
+ * @return bool
+ * @access public
+ * @deprecated
+ */
+ function isReady()
+ {
+ return true;
+ }
+
+ /**
+ * Deprecated init method - init is now a private
+ * method and has been replaced with _init
+ *
+ * @return bool
+ * @access public
+ * @deprecated
+ * @see Crypt_Blowfish::_init()
+ */
+ function init()
+ {
+ $this->_init();
+ }
+
+ /**
+ * Initializes the Crypt_Blowfish object
+ *
+ * @access private
+ */
+ function _init()
+ {
+ $defaults = new Crypt_Blowfish_DefaultKey();
+ $this->_P = $defaults->P;
+ $this->_S = $defaults->S;
+ }
+
+ /**
+ * Enciphers a single 64 bit block
+ *
+ * @param int &$Xl
+ * @param int &$Xr
+ * @access private
+ */
+ function _encipher(&$Xl, &$Xr)
+ {
+ for ($i = 0; $i < 16; $i++) {
+ $temp = $Xl ^ $this->_P[$i];
+ $Xl = ((($this->_S[0][($temp>>24) & 255] +
+ $this->_S[1][($temp>>16) & 255]) ^
+ $this->_S[2][($temp>>8) & 255]) +
+ $this->_S[3][$temp & 255]) ^ $Xr;
+ $Xr = $temp;
+ }
+ $Xr = $Xl ^ $this->_P[16];
+ $Xl = $temp ^ $this->_P[17];
+ }
+
+
+ /**
+ * Deciphers a single 64 bit block
+ *
+ * @param int &$Xl
+ * @param int &$Xr
+ * @access private
+ */
+ function _decipher(&$Xl, &$Xr)
+ {
+ for ($i = 17; $i > 1; $i--) {
+ $temp = $Xl ^ $this->_P[$i];
+ $Xl = ((($this->_S[0][($temp>>24) & 255] +
+ $this->_S[1][($temp>>16) & 255]) ^
+ $this->_S[2][($temp>>8) & 255]) +
+ $this->_S[3][$temp & 255]) ^ $Xr;
+ $Xr = $temp;
+ }
+ $Xr = $Xl ^ $this->_P[1];
+ $Xl = $temp ^ $this->_P[0];
+ }
+
+
+ /**
+ * Encrypts a string
+ *
+ * @param string $plainText
+ * @return string Returns cipher text on success, PEAR_Error on failure
+ * @access public
+ */
+ function encrypt($plainText)
+ {
+ if (!is_string($plainText)) {
+ PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ return mcrypt_generic($this->_td, $plainText);
+ }
+
+ $cipherText = '';
+ $len = strlen($plainText);
+ $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
+ for ($i = 0; $i < $len; $i += 8) {
+ list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
+ $this->_encipher($Xl, $Xr);
+ $cipherText .= pack("N2", $Xl, $Xr);
+ }
+ return $cipherText;
+ }
+
+
+ /**
+ * Decrypts an encrypted string
+ *
+ * @param string $cipherText
+ * @return string Returns plain text on success, PEAR_Error on failure
+ * @access public
+ */
+ function decrypt($cipherText)
+ {
+ if (!is_string($cipherText)) {
+ PEAR::raiseError('Cipher text must be a string', 1, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ return mdecrypt_generic($this->_td, $cipherText);
+ }
+
+ $plainText = '';
+ $len = strlen($cipherText);
+ $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
+ for ($i = 0; $i < $len; $i += 8) {
+ list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
+ $this->_decipher($Xl, $Xr);
+ $plainText .= pack("N2", $Xl, $Xr);
+ }
+ return $plainText;
+ }
+
+
+ /**
+ * Sets the secret key
+ * The key must be non-zero, and less than or equal to
+ * 56 characters in length.
+ *
+ * @param string $key
+ * @return bool Returns true on success, PEAR_Error on failure
+ * @access public
+ */
+ function setKey($key)
+ {
+ if (!is_string($key)) {
+ PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
+ }
+
+ $len = strlen($key);
+
+ if ($len > 56 || $len == 0) {
+ PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
+ }
+
+ if (extension_loaded('mcrypt')) {
+ mcrypt_generic_init($this->_td, $key, $this->_iv);
+ return true;
+ }
+
+ require_once 'Blowfish/DefaultKey.php';
+ $this->_init();
+
+ $k = 0;
+ $data = 0;
+ $datal = 0;
+ $datar = 0;
+
+ for ($i = 0; $i < 18; $i++) {
+ $data = 0;
+ for ($j = 4; $j > 0; $j--) {
+ $data = $data << 8 | ord($key{$k});
+ $k = ($k+1) % $len;
+ }
+ $this->_P[$i] ^= $data;
+ }
+
+ for ($i = 0; $i <= 16; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_P[$i] = $datal;
+ $this->_P[$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[0][$i] = $datal;
+ $this->_S[0][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[1][$i] = $datal;
+ $this->_S[1][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[2][$i] = $datal;
+ $this->_S[2][$i+1] = $datar;
+ }
+ for ($i = 0; $i < 256; $i += 2) {
+ $this->_encipher($datal, $datar);
+ $this->_S[3][$i] = $datal;
+ $this->_S[3][$i+1] = $datar;
+ }
+
+ return true;
+ }
+
+}
+
+?>
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
new file mode 100644
index 0000000000..2ff8ac788a
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
@@ -0,0 +1,327 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+/**
+ * Class containing default key
+ *
+ * @category Encryption
+ * @package Crypt_Blowfish
+ * @author Matthew Fonda <mfonda@php.net>
+ * @copyright 2005 Matthew Fonda
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @link http://pear.php.net/package/Crypt_Blowfish
+ * @version @package_version@
+ * @access public
+ */
+class Crypt_Blowfish_DefaultKey
+{
+ var $P = array();
+
+ var $S = array();
+
+ function Crypt_Blowfish_DefaultKey()
+ {
+ $this->P = array(
+ 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+ 0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+ 0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+ 0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+ 0x9216D5D9, 0x8979FB1B
+ );
+
+ $this->S = array(
+ array(
+ 0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+ 0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+ 0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+ 0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+ 0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+ 0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+ 0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+ 0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+ 0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+ 0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+ 0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+ 0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+ 0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+ 0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+ 0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+ 0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+ 0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+ 0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+ 0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+ 0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+ 0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+ 0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+ 0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+ 0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+ 0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+ 0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+ 0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+ 0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+ 0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+ 0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+ 0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+ 0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+ 0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+ 0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+ 0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+ 0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+ 0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+ 0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+ 0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+ 0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+ 0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+ 0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+ 0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+ 0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+ 0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+ 0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+ 0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+ 0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+ 0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+ 0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+ 0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+ 0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+ 0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+ 0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+ 0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+ 0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+ 0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+ 0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+ 0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+ 0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+ 0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+ 0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+ 0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+ 0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
+ ),
+ array(
+ 0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+ 0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+ 0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+ 0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+ 0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+ 0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+ 0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+ 0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+ 0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+ 0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+ 0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+ 0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+ 0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+ 0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+ 0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+ 0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+ 0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+ 0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+ 0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+ 0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+ 0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+ 0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+ 0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+ 0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+ 0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+ 0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+ 0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+ 0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+ 0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+ 0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+ 0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+ 0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+ 0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+ 0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+ 0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+ 0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+ 0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+ 0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+ 0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+ 0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+ 0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+ 0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+ 0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+ 0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+ 0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+ 0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+ 0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+ 0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+ 0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+ 0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+ 0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+ 0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+ 0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+ 0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+ 0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+ 0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+ 0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+ 0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+ 0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+ 0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+ 0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+ 0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+ 0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+ 0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
+ ),
+ array(
+ 0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+ 0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+ 0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+ 0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+ 0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+ 0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+ 0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+ 0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+ 0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+ 0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+ 0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+ 0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+ 0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+ 0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+ 0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+ 0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+ 0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+ 0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+ 0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+ 0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+ 0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+ 0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+ 0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+ 0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+ 0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+ 0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+ 0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+ 0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+ 0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+ 0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+ 0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+ 0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+ 0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+ 0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+ 0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+ 0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+ 0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+ 0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+ 0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+ 0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+ 0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+ 0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+ 0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+ 0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+ 0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+ 0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+ 0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+ 0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+ 0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+ 0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+ 0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+ 0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+ 0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+ 0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+ 0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+ 0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+ 0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+ 0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+ 0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+ 0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+ 0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+ 0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+ 0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+ 0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
+ ),
+ array(
+ 0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+ 0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+ 0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+ 0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+ 0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+ 0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+ 0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+ 0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+ 0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+ 0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+ 0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+ 0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+ 0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+ 0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+ 0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+ 0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+ 0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+ 0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+ 0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+ 0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+ 0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+ 0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+ 0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+ 0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+ 0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+ 0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+ 0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+ 0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+ 0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+ 0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+ 0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+ 0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+ 0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+ 0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+ 0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+ 0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+ 0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+ 0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+ 0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+ 0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+ 0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+ 0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+ 0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+ 0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+ 0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+ 0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+ 0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+ 0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+ 0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+ 0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+ 0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+ 0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+ 0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+ 0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+ 0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+ 0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+ 0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+ 0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+ 0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+ 0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+ 0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+ 0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+ 0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+ 0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
+ )
+ );
+ }
+
+}
+
+?>
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 783c19d254..8ff9fc5ff5 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,7 @@
namespace OCA\Encryption;
-require_once 'Crypt_Blowfish/Blowfish.php';
+require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
/**
* Class for common cryptography functionality
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 049f3fb5d9..eaedc48541 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,7 +7,7 @@
* See the COPYING-README file.
*/
-require_once realpath(dirname(__FILE__) . '/../../../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 849f16c696..e205ff2b62 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,7 +20,7 @@
*
*/
-require_once realpath(dirname(__FILE__) . '/../../../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
--
GitLab
From 4c27c7e1994e863926edaad6e682b3f889075e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 21 May 2013 12:22:03 +0200
Subject: [PATCH 272/304] fix path, needs to be relative to data/
---
apps/files_encryption/lib/proxy.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 55ad882a8f..ea6b3bf345 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -484,7 +484,7 @@ class Proxy extends \OC_FileProxy
$fileInfo['unencrypted_size'] = $size;
// put file info
- $view->putFileInfo($path_f, $fileInfo);
+ $view->putFileInfo($path, $fileInfo);
}
}
}
--
GitLab
From 9d324db05481620fd9a6883c1315e0b31fc21c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 21 May 2013 12:33:32 +0200
Subject: [PATCH 273/304] fix path to 3rdparty apps
---
apps/files_encryption/lib/crypt.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 8ff9fc5ff5..1a5c9300a2 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,8 @@
namespace OCA\Encryption;
-require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
+//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
/**
* Class for common cryptography functionality
--
GitLab
From 1deeec93b74c5adde44bcac30538caf75442a1da Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 21 May 2013 21:09:25 +0200
Subject: [PATCH 274/304] fixed postFileSize
---
apps/files_encryption/lib/proxy.php | 30 ++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ea6b3bf345..7419a85e9b 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -465,28 +465,36 @@ class Proxy extends \OC_FileProxy
return $size;
}
- // get file info from database/cache
- $fileInfo = \OC\Files\Filesystem::getFileInfo($path_f);
+ $fileInfo = false;
+ // get file info from database/cache if not .part file
+ if(!Keymanager::isPartialFilePath($path)) {
+ $fileInfo = $view->getFileInfo($path);
+ }
// if file is encrypted return real file size
if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
$size = $fileInfo['unencrypted_size'];
} else {
// self healing if file was removed from file cache
- if (is_array($fileInfo)) {
- $userId = \OCP\User::getUser();
- $util = new Util($view, $userId);
- $fixSize = $util->getFileSize($path);
- if ($fixSize > 0) {
- $size = $fixSize;
+ if (!is_array($fileInfo)) {
+ $fileInfo = array();
+ }
- $fileInfo['encrypted'] = true;
- $fileInfo['unencrypted_size'] = $size;
+ $userId = \OCP\User::getUser();
+ $util = new Util($view, $userId);
+ $fixSize = $util->getFileSize($path);
+ if ($fixSize > 0) {
+ $size = $fixSize;
- // put file info
+ $fileInfo['encrypted'] = true;
+ $fileInfo['unencrypted_size'] = $size;
+
+ // put file info if not .part file
+ if(!Keymanager::isPartialFilePath($path_f)) {
$view->putFileInfo($path, $fileInfo);
}
}
+
}
return $size;
}
--
GitLab
From 095fc790ac28f7fa3fb0e30808b81d270f7e13d6 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Tue, 21 May 2013 21:09:39 +0200
Subject: [PATCH 275/304] added webdav test
---
apps/files_encryption/tests/webdav.php | 251 +++++++++++++++++++++++++
1 file changed, 251 insertions(+)
create mode 100755 apps/files_encryption/tests/webdav.php
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
new file mode 100755
index 0000000000..4b453d0c9d
--- /dev/null
+++ b/apps/files_encryption/tests/webdav.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Webdav
+ * @brief this class provide basic webdav tests for PUT,GET and DELETE
+ */
+class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ // init filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // register encryption file proxy
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // init filesystem for user
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ // login user
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clear all proxies
+ \OC_FileProxy::clearProxies();
+ }
+
+ /**
+ * @brief test webdav put random file
+ */
+ function testWebdavPUT() {
+
+ // generate filename
+ $filename = '/tmp-' . time() . '.txt';
+
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'OPTIONS';
+
+ $_SERVER['REQUEST_METHOD'] = 'PUT';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+ $_SERVER['CONTENT_TYPE'] = 'application/octet-stream';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+ $_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort);
+
+ // handle webdav request
+ $this->handleWebdavRequest($this->dataShort);
+
+ // check if file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+ // check if key-file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if shareKey-file was created
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get encrypted file content
+ $encryptedContent = $this->view->file_get_contents('/' . $this->userId . '/files' . $filename);
+
+ // restore proxy state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // check if encrypted content is valid
+ $this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
+
+ // get decrypted file contents
+ $decrypt = file_get_contents('crypt://' . $filename);
+
+ // check if file content match with the written content
+ $this->assertEquals($this->dataShort, $decrypt);
+
+ // return filename for next test
+ return $filename;
+ }
+
+ /**
+ * @brief test webdav get random file
+ *
+ * @depends testWebdavPUT
+ */
+ function testWebdavGET($filename) {
+
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+ // handle webdav request
+ $content = $this->handleWebdavRequest();
+
+ // check if file content match with the written content
+ $this->assertEquals($this->dataShort, $content);
+
+ // return filename for next test
+ return $filename;
+ }
+
+ /**
+ * @brief test webdav delete random file
+ * @depends testWebdavGET
+ */
+ function testWebdavDELETE($filename) {
+ // set server vars
+ $_SERVER['REQUEST_METHOD'] = 'DELETE';
+ $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+ $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+ $_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+ // handle webdav request
+ $content = $this->handleWebdavRequest();
+
+ // check if file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+ // check if key-file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
+
+ // check if shareKey-file was removed
+ $this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
+ }
+
+ /**
+ * @brief handle webdav request
+ *
+ * @param bool $body
+ *
+ * @note this init procedure is copied from /apps/files/remote.php
+ */
+ function handleWebdavRequest($body = false) {
+ // Backends
+ $authBackend = new OC_Connector_Sabre_Auth();
+ $lockBackend = new OC_Connector_Sabre_Locks();
+ $requestBackend = new OC_Connector_Sabre_Request();
+
+ // Create ownCloud Dir
+ $publicDir = new OC_Connector_Sabre_Directory('');
+
+ // Fire up server
+ $server = new Sabre_DAV_Server($publicDir);
+ $server->httpRequest = $requestBackend;
+ $server->setBaseUri('/remote.php/webdav/');
+
+ // Load plugins
+ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
+ $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
+ $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+ $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
+ $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
+
+ // And off we go!
+ if($body) {
+ $server->httpRequest->setBody($body);
+ }
+
+ // turn on output buffering
+ ob_start();
+
+ // handle request
+ $server->exec();
+
+ // file content is written in the output buffer
+ $content = ob_get_contents();
+
+ // flush the output buffer and turn off output buffering
+ ob_end_clean();
+
+ // return captured content
+ return $content;
+ }
+}
\ No newline at end of file
--
GitLab
From 9ca9a22c6a6495e657290195c97282aee8976282 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 22 May 2013 00:53:07 +0200
Subject: [PATCH 276/304] fixed finding encrypted files in subfolders and
removed unused code
---
apps/files_encryption/lib/keymanager.php | 58 +-----------
apps/files_encryption/lib/proxy.php | 50 +++++-----
apps/files_encryption/lib/stream.php | 113 +++++++----------------
apps/files_encryption/lib/util.php | 40 +-------
4 files changed, 61 insertions(+), 200 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 542b1cf287..ddd8f0ad6e 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -326,44 +326,6 @@ class Keymanager
}
- /**
- * @brief store private keys from the user
- *
- * @param string $privatekey
- * @param string $publickey
- * @return bool true/false
- */
- public static function setUserKeys($privatekey, $publickey)
- {
-
- return (self::setPrivateKey($privatekey) && self::setPublicKey($publickey));
-
- }
-
- /**
- * @brief store public key of the user
- *
- * @param string $key
- * @return bool true/false
- */
- public static function setPublicKey($key)
- {
-
- $view = new \OC_FilesystemView('/public-keys');
-
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- if (!$view->file_exists('')) $view->mkdir('');
-
- $result = $view->file_put_contents(\OCP\User::getUser() . '.public.key', $key);
-
- \OC_FileProxy::$enabled = $proxyStatus;
-
- return $result;
-
- }
-
/**
* @brief store share key
*
@@ -538,7 +500,7 @@ class Keymanager
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
if ($view->is_dir($shareKeyPath)) {
@@ -611,22 +573,4 @@ class Keymanager
return $targetPath;
}
-
- /**
- * @brief Fetch the legacy encryption key from user files
- * @internal param string $login used to locate the legacy key
- * @internal param string $passphrase used to decrypt the legacy key
- * @return boolean
- *
- * if the key is left out, the default handeler will be used
- */
- public function getLegacyKey()
- {
-
- $user = \OCP\User::getUser();
- $view = new \OC_FilesystemView('/' . $user);
- return $view->file_get_contents('encryption.key');
-
- }
-
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7419a85e9b..f29e893f12 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -170,7 +170,7 @@ class Proxy extends \OC_FileProxy
$data = $encData;
// Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo($filePath, array('encrypted' => true, 'size' => strlen($size), 'unencrypted_size' => $size), '');
+ \OC\Files\Filesystem::putFileInfo($filePath, array('encrypted' => true, 'size' => strlen($data), 'unencrypted_size' => $size), '');
// Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
@@ -189,28 +189,25 @@ class Proxy extends \OC_FileProxy
public function postFile_get_contents($path, $data)
{
- // FIXME: $path for shared files is just /uid/files/Shared/filepath
-
$userId = \OCP\USER::getUser();
$view = new \OC_FilesystemView('/');
$util = new Util($view, $userId);
$relPath = $util->stripUserFilesPath($path);
-
- // TODO check for existing key file and reuse it if possible to avoid problems with versioning etc.
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
+ // init session
+ $session = new Session($view);
+
// If data is a catfile
if (
Crypt::mode() == 'server'
- && Crypt::isCatfileContent($data) // TODO: Do we really need this check? Can't we assume it is properly encrypted?
+ && Crypt::isCatfileContent($data)
) {
- // TODO: use get owner to find correct location of key files for shared files
- $session = new Session($view);
$privateKey = $session->getPrivateKey($userId);
// Get the encrypted keyfile
@@ -229,9 +226,7 @@ class Proxy extends \OC_FileProxy
&& isset($_SESSION['legacyenckey'])
&& Crypt::isEncryptedMeta($path)
) {
-
$plainData = Crypt::legacyDecrypt($data, $session->getLegacyKey());
-
}
\OC_FileProxy::$enabled = $proxyStatus;
@@ -292,19 +287,6 @@ class Proxy extends \OC_FileProxy
}
- /**
- * @brief When a file is renamed, rename its keyfile also
- * @param $path
- * @return bool Result of rename()
- * @note This is pre rather than post because using post didn't work
- */
- public function postWrite($path)
- {
- $this->handleFile($path);
-
- return true;
- }
-
/**
* @param $path
* @return bool
@@ -362,7 +344,6 @@ class Proxy extends \OC_FileProxy
// protocol and let it do the decryption work instead
$result = fopen('crypt://' . $path_f, $meta['mode']);
-
} elseif (
self::shouldEncrypt($path)
and $meta ['mode'] != 'r'
@@ -428,11 +409,28 @@ class Proxy extends \OC_FileProxy
*/
public function postStat($path, $data)
{
+ $content = '';
+ $view = new \OC_FilesystemView('/');
+ if($view->file_exists($path)) {
+ // disable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // we only need 24 byte from the last chunk
+ $handle = $view->fopen($path, 'r');
+ if (!fseek($handle, -24, SEEK_END)) {
+ $content = fgets($handle);
+ }
+
+ // re-enable proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
// check if file is encrypted
- if (Crypt::isCatfileContent($path)) {
+ if (Crypt::isCatfileContent($content)) {
// get file info from cache
- $cached = \OC\Files\Filesystem::getFileInfo($path, '');
+ $cached = $view->getFileInfo($path);
// set the real file size
$data['size'] = $cached['unencrypted_size'];
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 31546a2cc5..b143b62827 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -50,8 +50,6 @@ namespace OCA\Encryption;
*/
class Stream
{
-
- public static $sourceStreams = array();
private $plainKey;
private $encKeyfiles;
@@ -96,57 +94,41 @@ class Stream
// rawPath is relative to the data directory
$this->rawPath = $util->getUserFilesDir() . $this->relPath;
+ // Disable fileproxies so we can get the file size and open the source file without recursive encryption
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
if (
- dirname($this->rawPath) == 'streams'
- and isset(self::$sourceStreams[basename($this->rawPath)])
+ $mode == 'w'
+ or $mode == 'w+'
+ or $mode == 'wb'
+ or $mode == 'wb+'
) {
- // Is this just for unit testing purposes?
-
- $this->handle = self::$sourceStreams[basename($this->rawPath)]['stream'];
-
- $this->path = self::$sourceStreams[basename($this->rawPath)]['path'];
-
- $this->size = self::$sourceStreams[basename($this->rawPath)]['size'];
+ // We're writing a new file so start write counter with 0 bytes
+ $this->size = 0;
+ $this->unencryptedSize = 0;
} else {
- // Disable fileproxies so we can get the file size and open the source file without recursive encryption
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- if (
- $mode == 'w'
- or $mode == 'w+'
- or $mode == 'wb'
- or $mode == 'wb+'
- ) {
-
- // We're writing a new file so start write counter with 0 bytes
- $this->size = 0;
- $this->unencryptedSize = 0;
-
- } else {
+ $this->size = $this->rootView->filesize($this->rawPath, $mode);
+ }
- $this->size = $this->rootView->filesize($this->rawPath, $mode);
+ $this->handle = $this->rootView->fopen($this->rawPath, $mode);
- }
+ \OC_FileProxy::$enabled = $proxyStatus;
- $this->handle = $this->rootView->fopen($this->rawPath, $mode);
+ if (!is_resource($this->handle)) {
- \OC_FileProxy::$enabled = $proxyStatus;
+ \OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
- if (!is_resource($this->handle)) {
+ } else {
- \OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
+ $this->meta = stream_get_meta_data($this->handle);
- } else {
+ }
- $this->meta = stream_get_meta_data($this->handle);
- }
-
- }
return is_resource($this->handle);
@@ -165,14 +147,6 @@ class Stream
}
- /**
- * @return int
- */
- public function stream_tell()
- {
- return ftell($this->handle);
- }
-
/**
* @param $count
* @return bool|string
@@ -259,7 +233,6 @@ class Stream
// If a keyfile already exists
if ($this->encKeyfile) {
- $this->setUserProperty();
$session = new Session($this->rootView);
@@ -279,23 +252,6 @@ class Stream
}
- public function setUserProperty()
- {
-
- // Only get the user again if it isn't already set
- if (empty($this->userId)) {
-
- // TODO: Move this user call out of here - it belongs
- // elsewhere
- $this->userId = \OCP\User::getUser();
-
- }
-
- // TODO: Add a method for getting the user in case OCP\User::
- // getUser() doesn't work (can that scenario ever occur?)
-
- }
-
/**
* @brief Handle plain data from the stream, and write it in 8192 byte blocks
* @param string $data data to be written to disk
@@ -318,16 +274,10 @@ class Stream
// Get the length of the unencrypted data that we are handling
$length = strlen($data);
- // So far this round, no data has been written
- $written = 0;
-
- // Find out where we are up to in the writing of data to the
+ // Find out where we are up to in the writing of data to the
// file
$pointer = ftell($this->handle);
- // Make sure the userId is set
- $this->setUserProperty();
-
// Get / generate the keyfile for the file we're handling
// If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
@@ -337,7 +287,6 @@ class Stream
}
-
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
if ($this->writeCache) {
@@ -351,17 +300,16 @@ class Stream
}
-
// While there still remains somed data to be processed & written
while (strlen($data) > 0) {
// Remaining length for this iteration, not of the
// entire file (may be greater than 8192 bytes)
- $remainingLength = strlen( $data );
+ $remainingLength = strlen($data);
// If data remaining to be written is less than the
// size of 1 6126 byte block
- if (strlen($data) < 6126) {
+ if ($remainingLength < 6126) {
// Set writeCache to contents of $data
// The writeCache will be carried over to the
@@ -388,9 +336,7 @@ class Stream
// being handled totals more than 6126 bytes
fwrite($this->handle, $encrypted);
- $writtenLen = strlen($encrypted);
-
- // Remove the chunk we just processed from
+ // Remove the chunk we just processed from
// $data, leaving only unprocessed data in $data
// var, for handling on the next round
$data = substr($data, 6126);
@@ -416,16 +362,19 @@ class Stream
*/
public function stream_set_option($option, $arg1, $arg2)
{
+ $return = false;
switch ($option) {
case STREAM_OPTION_BLOCKING:
- stream_set_blocking($this->handle, $arg1);
+ $return = stream_set_blocking($this->handle, $arg1);
break;
case STREAM_OPTION_READ_TIMEOUT:
- stream_set_timeout($this->handle, $arg1, $arg2);
+ $return = stream_set_timeout($this->handle, $arg1, $arg2);
break;
case STREAM_OPTION_WRITE_BUFFER:
- stream_set_write_buffer($this->handle, $arg1, $arg2);
+ $return = stream_set_write_buffer($this->handle, $arg1);
}
+
+ return $return;
}
/**
@@ -441,7 +390,7 @@ class Stream
*/
public function stream_lock($mode)
{
- flock($this->handle, $mode);
+ return flock($this->handle, $mode);
}
/**
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8147982d48..1f4609ae2f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -367,14 +367,16 @@ class Util
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
- public function findEncFiles($directory)
+ public function findEncFiles($directory, &$found = false)
{
// Disable proxy - we don't want files to be decrypted before
// we handle them
\OC_FileProxy::$enabled = false;
- $found = array('plain' => array(), 'encrypted' => array(), 'legacy' => array());
+ if($found == false) {
+ $found = array('plain' => array(), 'encrypted' => array(), 'legacy' => array());
+ }
if (
$this->view->is_dir($directory)
@@ -395,7 +397,7 @@ class Util
// its contents
if ($this->view->is_dir($filePath)) {
- $this->findEncFiles($filePath);
+ $this->findEncFiles($filePath, $found);
// If the path is a file, determine
// its encryption status
@@ -636,38 +638,6 @@ class Util
}
- /**
- * @brief Format a path to be relative to the /user directory
- * @note e.g. turns '/admin/files/test.txt' into 'files/test.txt'
- */
- public function stripFilesPath($path)
- {
-
- $trimmed = ltrim($path, '/');
- $split = explode('/', $trimmed);
- $sliced = array_slice($split, 1);
- $relPath = implode('/', $sliced);
-
- return $relPath;
-
- }
-
- /**
- * @brief Format a shared path to be relative to the /user/files/ directory
- * @note Expects a path like /uid/files/Shared/filepath
- */
- public function stripSharedFilePath($path)
- {
-
- $trimmed = ltrim($path, '/');
- $split = explode('/', $trimmed);
- $sliced = array_slice($split, 3);
- $relPath = implode('/', $sliced);
-
- return $relPath;
-
- }
-
/**
* @param $path
* @return bool
--
GitLab
From afbfa742d7848089523262f5c234035db1b20d3b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 22 May 2013 00:55:16 +0200
Subject: [PATCH 277/304] improved tests
---
apps/files_encryption/lib/proxy.php | 55 ---
apps/files_encryption/tests/crypt.php | 89 +----
apps/files_encryption/tests/keymanager.php | 77 +++-
apps/files_encryption/tests/share.php | 5 +-
apps/files_encryption/tests/stream.php | 406 +++++++++------------
apps/files_encryption/tests/util.php | 57 +++
6 files changed, 301 insertions(+), 388 deletions(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f29e893f12..cc9d239b25 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -359,24 +359,6 @@ class Proxy extends \OC_FileProxy
}
- /**
- * @param $path
- * @param $mime
- * @return string
- */
- public function postGetMimeType($path, $mime)
- {
-
- if (Crypt::isCatfileContent($path)) {
-
- $mime = \OCP\Files::getMimeType('crypt://' . $path, 'w');
-
- }
-
- return $mime;
-
- }
-
/**
* @param $path
* @param $data
@@ -402,43 +384,6 @@ class Proxy extends \OC_FileProxy
return $data;
}
- /**
- * @param $path
- * @param $data
- * @return mixed
- */
- public function postStat($path, $data)
- {
- $content = '';
- $view = new \OC_FilesystemView('/');
- if($view->file_exists($path)) {
- // disable encryption proxy
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
-
- // we only need 24 byte from the last chunk
- $handle = $view->fopen($path, 'r');
- if (!fseek($handle, -24, SEEK_END)) {
- $content = fgets($handle);
- }
-
- // re-enable proxy
- \OC_FileProxy::$enabled = $proxyStatus;
- }
-
- // check if file is encrypted
- if (Crypt::isCatfileContent($content)) {
-
- // get file info from cache
- $cached = $view->getFileInfo($path);
-
- // set the real file size
- $data['size'] = $cached['unencrypted_size'];
- }
-
- return $data;
- }
-
/**
* @param $path
* @param $size
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index eaedc48541..621941c52a 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -432,29 +432,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->view->unlink($this->userId . '/files/' . $filename);
}
- // Is this test still necessary?
-// function testSymmetricBlockStreamDecryptFileContent() {
-//
-// \OC_User::setUserId( 'admin' );
-//
-// // Disable encryption proxy to prevent unwanted en/decryption
-// \OC_FileProxy::$enabled = false;
-//
-// $cryptedFile = file_put_contents( 'crypt://' . '/blockEncrypt', $this->dataUrl );
-//
-// // Disable encryption proxy to prevent unwanted en/decryption
-// \OC_FileProxy::$enabled = false;
-//
-// echo "\n\n\$cryptedFile = " . $this->view->file_get_contents( '/blockEncrypt' );
-//
-// $retreivedCryptedFile = file_get_contents( 'crypt://' . '/blockEncrypt' );
-//
-// $this->assertEquals( $this->dataUrl, $retreivedCryptedFile );
-//
-// \OC_FileProxy::$enabled = false;
-//
-// }
-
function testSymmetricEncryptFileContentKeyfile()
{
@@ -585,6 +562,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->dataLong, $decrypted);
+ $this->assertFalse(Encryption\Crypt::getBlowfish(''));
}
/**
@@ -852,69 +830,4 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
// tear down
$view->unlink($filename);
}
-
-// function testEncryption(){
-//
-// $key=uniqid();
-// $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// $source=file_get_contents($file); //nice large text file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $chunk=substr($source,0,8192);
-// $encrypted=OC_Encryption\Crypt::encrypt($chunk,$key);
-// $this->assertEquals(strlen($chunk),strlen($encrypted));
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$chunk);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $tmpFileEncrypted=OCP\Files::tmpFile();
-// OC_Encryption\Crypt::encryptfile($file,$tmpFileEncrypted,$key);
-// $encrypted=file_get_contents($tmpFileEncrypted);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertNotEquals($encrypted,$source);
-// $this->assertEquals($decrypted,$source);
-//
-// $tmpFileDecrypted=OCP\Files::tmpFile();
-// OC_Encryption\Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
-// $decrypted=file_get_contents($tmpFileDecrypted);
-// $this->assertEquals($decrypted,$source);
-//
-// $file=OC::$SERVERROOT.'/core/img/weather-clear.png';
-// $source=file_get_contents($file); //binary file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$source);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// $this->assertEquals($decrypted,$source);
-//
-// }
-//
-// function testBinary(){
-// $key=uniqid();
-//
-// $file=__DIR__.'/binary';
-// $source=file_get_contents($file); //binary file
-// $encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-//
-// $decrypted=rtrim($decrypted, "\0");
-// $this->assertEquals($decrypted,$source);
-//
-// $encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// $decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
-// $this->assertEquals($decrypted,$source);
-// }
-
}
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 334cc743f2..b1bae673e8 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -31,6 +31,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
*/
public $view;
public $randomKey;
+ public $dataShort;
function setUp()
{
@@ -150,34 +151,18 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
- // Disable encryption proxy to prevent recursive calls
+ // enable encryption proxy
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = true;
// cleanup
$this->view->unlink('/' . $this->userId . '/files/' . $file);
- // Re-enable proxy - our work is done
+ // change encryption proxy to previous state
\OC_FileProxy::$enabled = $proxyStatus;
}
-// /**
-// * @depends testGetPrivateKey
-// */
-// function testGetPrivateKey_decrypt() {
-//
-// $key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-//
-// # TODO: replace call to Crypt with a mock object?
-// $decrypted = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->passphrase );
-//
-// $this->assertEquals( 1704, strlen( $decrypted ) );
-//
-// $this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
-//
-// }
-
function testGetUserKeys()
{
@@ -201,4 +186,60 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('key', $sslInfoPrivate);
}
+
+ function testFixPartialFilePath()
+ {
+
+ $partFilename = 'testfile.txt.part';
+ $filename = 'testfile.txt';
+
+ $this->assertTrue(Encryption\Keymanager::isPartialFilePath($partFilename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($partFilename));
+
+ $this->assertFalse(Encryption\Keymanager::isPartialFilePath($filename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
+ }
+
+ function testRecursiveDelShareKeys()
+ {
+
+ // generate filename
+ $filename = '/tmp-' . time() . '.txt';
+
+ // create folder structure
+ $this->view->mkdir('/admin/files/folder1');
+ $this->view->mkdir('/admin/files/folder1/subfolder');
+ $this->view->mkdir('/admin/files/folder1/subfolder/subsubfolder');
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///folder1/subfolder/subsubfolder/' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // recursive delete keys
+ Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
+
+ // enable encryption proxy
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = true;
+
+ // cleanup
+ $this->view->unlink('/admin/files/folder1');
+
+ // change encryption proxy to previous state
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index e205ff2b62..1d0cbfbc1d 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -312,7 +312,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
// cleanup
- $this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ $this->view->unlink('/admin/files' . $this->folder1);
// check if share key not exists
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
@@ -621,7 +621,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
- \OCA\Encryption\Helper::adminDisableRecovery('test123');
+ $this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
+ $this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 633cc9e4fc..3765d986e1 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -1,226 +1,182 @@
<?php
-// /**
-// * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
-// * This file is licensed under the Affero General Public License version 3 or
-// * later.
-// * See the COPYING-README file.
-// */
-//
-// namespace OCA\Encryption;
-//
-// class Test_Stream extends \PHPUnit_Framework_TestCase {
-//
-// function setUp() {
-//
-// \OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-//
-// $this->empty = '';
-//
-// $this->stream = new Stream();
-//
-// $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-// $this->dataShort = 'hats';
-//
-// $this->emptyTmpFilePath = \OCP\Files::tmpFile();
-//
-// $this->dataTmpFilePath = \OCP\Files::tmpFile();
-//
-// file_put_contents( $this->dataTmpFilePath, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est." );
-//
-// }
-//
-// function testStreamOpen() {
-//
-// $stream1 = new Stream();
-//
-// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-//
-// // Test that resource was returned successfully
-// $this->assertTrue( $handle1 );
-//
-// // Test that file has correct size
-// $this->assertEquals( 0, $stream1->size );
-//
-// // Test that path is correct
-// $this->assertEquals( $this->emptyTmpFilePath, $stream1->rawPath );
-//
-// $stream2 = new Stream();
-//
-// $handle2 = $stream2->stream_open( 'crypt://' . $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-//
-// // Test that protocol identifier is removed from path
-// $this->assertEquals( $this->emptyTmpFilePath, $stream2->rawPath );
-//
-// // "Stat failed error" prevents this test from executing
-// // $stream3 = new Stream();
-// //
-// // $handle3 = $stream3->stream_open( $this->dataTmpFilePath, 'r', array(), $this->empty );
-// //
-// // $this->assertEquals( 0, $stream3->size );
-//
-// }
-//
-// function testStreamWrite() {
-//
-// $stream1 = new Stream();
-//
-// $handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'r+b', array(), $this->empty );
-//
-// # what about the keymanager? there is no key for the newly created temporary file!
-//
-// $stream1->stream_write( $this->dataShort );
-//
-// }
-//
-// // function getStream( $id, $mode, $size ) {
-// //
-// // if ( $id === '' ) {
-// //
-// // $id = uniqid();
-// // }
-// //
-// //
-// // if ( !isset( $this->tmpFiles[$id] ) ) {
-// //
-// // // If tempfile with given name does not already exist, create it
-// //
-// // $file = OCP\Files::tmpFile();
-// //
-// // $this->tmpFiles[$id] = $file;
-// //
-// // } else {
-// //
-// // $file = $this->tmpFiles[$id];
-// //
-// // }
-// //
-// // $stream = fopen( $file, $mode );
-// //
-// // Stream::$sourceStreams[$id] = array( 'path' => 'dummy' . $id, 'stream' => $stream, 'size' => $size );
-// //
-// // return fopen( 'crypt://streams/'.$id, $mode );
-// //
-// // }
-// //
-// // function testStream( ){
-// //
-// // $stream = $this->getStream( 'test1', 'w', strlen( 'foobar' ) );
-// //
-// // fwrite( $stream, 'foobar' );
-// //
-// // fclose( $stream );
-// //
-// //
-// // $stream = $this->getStream( 'test1', 'r', strlen( 'foobar' ) );
-// //
-// // $data = fread( $stream, 6 );
-// //
-// // fclose( $stream );
-// //
-// // $this->assertEquals( 'foobar', $data );
-// //
-// //
-// // $file = OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// //
-// // $source = fopen( $file, 'r' );
-// //
-// // $target = $this->getStream( 'test2', 'w', 0 );
-// //
-// // OCP\Files::streamCopy( $source, $target );
-// //
-// // fclose( $target );
-// //
-// // fclose( $source );
-// //
-// //
-// // $stream = $this->getStream( 'test2', 'r', filesize( $file ) );
-// //
-// // $data = stream_get_contents( $stream );
-// //
-// // $original = file_get_contents( $file );
-// //
-// // $this->assertEquals( strlen( $original ), strlen( $data ) );
-// //
-// // $this->assertEquals( $original, $data );
-// //
-// // }
-//
-// }
-//
-// // class Test_CryptStream extends PHPUnit_Framework_TestCase {
-// // private $tmpFiles=array();
-// //
-// // function testStream(){
-// // $stream=$this->getStream('test1','w',strlen('foobar'));
-// // fwrite($stream,'foobar');
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test1','r',strlen('foobar'));
-// // $data=fread($stream,6);
-// // fclose($stream);
-// // $this->assertEquals('foobar',$data);
-// //
-// // $file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// // $source=fopen($file,'r');
-// // $target=$this->getStream('test2','w',0);
-// // OCP\Files::streamCopy($source,$target);
-// // fclose($target);
-// // fclose($source);
-// //
-// // $stream=$this->getStream('test2','r',filesize($file));
-// // $data=stream_get_contents($stream);
-// // $original=file_get_contents($file);
-// // $this->assertEquals(strlen($original),strlen($data));
-// // $this->assertEquals($original,$data);
-// // }
-// //
-// // /**
-// // * get a cryptstream to a temporary file
-// // * @param string $id
-// // * @param string $mode
-// // * @param int size
-// // * @return resource
-// // */
-// // function getStream($id,$mode,$size){
-// // if($id===''){
-// // $id=uniqid();
-// // }
-// // if(!isset($this->tmpFiles[$id])){
-// // $file=OCP\Files::tmpFile();
-// // $this->tmpFiles[$id]=$file;
-// // }else{
-// // $file=$this->tmpFiles[$id];
-// // }
-// // $stream=fopen($file,$mode);
-// // OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
-// // return fopen('crypt://streams/'.$id,$mode);
-// // }
-// //
-// // function testBinary(){
-// // $file=__DIR__.'/binary';
-// // $source=file_get_contents($file);
-// //
-// // $stream=$this->getStream('test','w',strlen($source));
-// // fwrite($stream,$source);
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test','r',strlen($source));
-// // $data=stream_get_contents($stream);
-// // fclose($stream);
-// // $this->assertEquals(strlen($data),strlen($source));
-// // $this->assertEquals($source,$data);
-// //
-// // $file=__DIR__.'/zeros';
-// // $source=file_get_contents($file);
-// //
-// // $stream=$this->getStream('test2','w',strlen($source));
-// // fwrite($stream,$source);
-// // fclose($stream);
-// //
-// // $stream=$this->getStream('test2','r',strlen($source));
-// // $data=stream_get_contents($stream);
-// // fclose($stream);
-// // $this->assertEquals(strlen($data),strlen($source));
-// // $this->assertEquals($source,$data);
-// // }
-// // }
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Stream
+ * @brief this class provide basic stream tests
+ */
+class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ // init filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // register encryption file proxy
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::disable('files_trashbin');
+
+ // init filesystem for user
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ // login user
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clear all proxies
+ \OC_FileProxy::clearProxies();
+ }
+
+ function testStreamOptions() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // check if stream is at position zero
+ $this->assertEquals(0,ftell($handle));
+
+ // set stream options
+ $this->assertTrue(flock($handle, LOCK_SH));
+ $this->assertTrue(flock($handle, LOCK_UN));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetBlocking() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertTrue(stream_set_blocking($handle,1));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetTimeout() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertFalse(stream_set_timeout($handle,1));
+
+ // tear down
+ $view->unlink($filename);
+ }
+
+ function testStreamSetWriteBuffer() {
+ $filename = '/tmp-' . time();
+ $view = new \OC\Files\View('/' . $this->userId . '/files');
+
+ // Save short data as encrypted file using stream wrapper
+ $cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+ // Test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ $handle = $view->fopen($filename, 'r');
+
+ // set stream options
+ $this->assertEquals(0, stream_set_write_buffer($handle,1024));
+
+ // tear down
+ $view->unlink($filename);
+ }
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 667ee24f04..a2be8a4041 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -217,4 +217,61 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
$this->assertEquals($file, $filename);
}
+
+ function testIsSharedPath() {
+ $sharedPath = '/user1/files/Shared/test';
+ $path = '/user1/files/test';
+
+ $this->assertTrue($this->util->isSharedPath($sharedPath));
+
+ $this->assertFalse($this->util->isSharedPath($path));
+ }
+
+ function testEncryptLagacyFiles()
+ {
+ $userView = new \OC_FilesystemView( '/' . $this->userId);
+ $view = new \OC_FilesystemView( '/' . $this->userId . '/files' );
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ $encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+ $userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+ $legacyEncryptedData = file_get_contents($this->legacyEncryptedData);
+ $view->mkdir('/test/');
+ $view->mkdir('/test/subtest/');
+ $view->file_put_contents('/test/subtest/legacy-encrypted-text.txt', $legacyEncryptedData);
+
+ $fileInfo = $view->getFileInfo('/test/subtest/legacy-encrypted-text.txt');
+ $fileInfo['encrypted'] = true;
+ $view->putFileInfo('/test/subtest/legacy-encrypted-text.txt', $fileInfo);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+
+ $util = new Encryption\Util($this->view, $this->userId);
+ $util->setMigrationStatus(0);
+
+ $this->assertTrue(OCA\Encryption\Hooks::login($params));
+
+ $this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
+
+ $files = $util->findEncFiles('/' . $this->userId . '/files/');
+
+ $this->assertTrue(is_array($files));
+
+ $found = false;
+ foreach($files['encrypted'] as $encryptedFile) {
+ if($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
+ $found = true;
+ break;
+ }
+ }
+
+ $this->assertTrue($found);
+ }
}
\ No newline at end of file
--
GitLab
From c6722581f982d05909664171bd66cc7ec2a2a67b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 22 May 2013 02:02:42 +0200
Subject: [PATCH 278/304] fix pgsql error
---
apps/files_encryption/lib/util.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 1f4609ae2f..784d74bd75 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -706,13 +706,16 @@ class Util
// NOTE: Stream{} will be invoked for handling
// the encryption, and should handle all keys
// and their generation etc. automatically
- $size = stream_copy_to_stream($plainHandle2, $encHandle);
+ stream_copy_to_stream($plainHandle2, $encHandle);
+
+ // get file size
+ $size = $this->view->filesize($rawPath . '.plaintmp');
// Delete temporary plain copy of file
$this->view->unlink($rawPath . '.plaintmp');
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo($plainFile['path'], array('encrypted' => true, 'size' => $size), '');
+ \OC\Files\Filesystem::putFileInfo($plainFile['path'], array('encrypted' => true, 'size' => $size, 'unencrypted_size' => $size));
}
// Encrypt legacy encrypted files
--
GitLab
From d590064fdfb8f46c64ebd0b54cd3b7acd8c9fc78 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 22 May 2013 02:19:52 +0200
Subject: [PATCH 279/304] [tx-robot] updated from transifex
---
apps/files_external/l10n/pl.php | 1 +
core/l10n/pl.php | 1 +
l10n/pl/core.po | 9 +++++----
l10n/pl/files_external.po | 9 +++++----
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_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 +-
15 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index cd1b1fe84a..e03ded1e70 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -6,6 +6,7 @@
"Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone. Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Wsparcie dla Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji.",
"External Storage" => "Zewnętrzna zasoby dyskowe",
"Folder name" => "Nazwa folderu",
"External storage" => "Zewnętrzne zasoby dyskowe",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 5c8434984c..37d01abf84 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -88,6 +88,7 @@
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
"ownCloud password reset" => "restart hasła ownCloud",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
"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.",
"Username" => "Nazwa użytkownika",
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index e023ed3428..8317035b93 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
-"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
+"PO-Revision-Date: 2013-05-21 07:00+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -402,7 +403,7 @@ msgid ""
"The link to reset your password has been sent to your email.<br>If you do "
"not receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a."
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index d363de4780..a130c038c3 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
+"PO-Revision-Date: 2013-05-21 07:20+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -55,7 +56,7 @@ msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Ostrzeżenie:</b> Wsparcie dla Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 78d60372e1..a9d3136889 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 0ab57eb950..c294df5ef0 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 76b4b7293a..4997ad02d2 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 7bfc3647dd..af78203998 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 48923f8af3..91ce57c6d3 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 3e9ecd756f..23de9ceb55 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 91f8d60881..6c897bae2e 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 55b22c52c6..ef7c6f4003 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-05-21 02:01+0200\n"
+"POT-Creation-Date: 2013-05-22 02:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index fe59c434e9..a7651f9f1e 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-05-21 02:01+0200\n"
+"POT-Creation-Date: 2013-05-22 02:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index e14b4cb292..f18624f277 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 018936d3d9..c6985473c6 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-05-21 02:00+0200\n"
+"POT-Creation-Date: 2013-05-22 02:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
--
GitLab
From 1b68c0c0cdf1fb68149efd18e661be0a38bcfd62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 8 May 2013 15:30:04 +0200
Subject: [PATCH 280/304] allow install when only oracle is available
---
lib/util.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/util.php b/lib/util.php
index 48c224a303..01e2df7bfc 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -173,7 +173,8 @@ class OC_Util {
//check for database drivers
if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
and !is_callable('mysql_connect')
- and !is_callable('pg_connect')) {
+ and !is_callable('pg_connect')
+ and !is_callable('oci_connect')) {
$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
'hint'=>'');//TODO: sane hint
$web_server_restart= true;
--
GitLab
From eceb3c8ed5f3068808bc8fc5ceec5fda1ac50db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 29 Apr 2013 12:25:27 +0200
Subject: [PATCH 281/304] add debug output
---
lib/app.php | 5 ++++-
lib/db.php | 9 ++-------
lib/files/cache/cache.php | 15 ++++++++++++---
lib/setup.php | 12 ++++++++++--
lib/user.php | 2 +-
lib/user/database.php | 2 +-
6 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/lib/app.php b/lib/app.php
index 55b4543ec9..0a7069ca60 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -173,8 +173,11 @@ class OC_App{
}
$apps=array('files');
$query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig`'
- .' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'' );
+ .' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'' );
$result=$query->execute();
+ if( \OC_DB::isError($result)) {
+ throw new DatabaseException($result->getMessage(), $query);
+ }
while($row=$result->fetchRow()) {
if(array_search($row['appid'], $apps)===false) {
$apps[]=$row['appid'];
diff --git a/lib/db.php b/lib/db.php
index 8f6f50bda6..5b45f81f99 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -276,15 +276,10 @@ class OC_DB {
'phptype' => 'oci8',
'username' => $user,
'password' => $pass,
+ 'service' => $name,
+ 'hostspec' => $host,
'charset' => 'AL32UTF8',
);
- if ($host != '') {
- $dsn['hostspec'] = $host;
- $dsn['database'] = $name;
- } else { // use dbname for hostspec
- $dsn['hostspec'] = $name;
- $dsn['database'] = $user;
- }
break;
case 'mssql':
$dsn = array(
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 0617471079..adffe766dd 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -145,8 +145,11 @@ class Cache {
if ($fileId > -1) {
$query = \OC_DB::prepare(
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
- FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
+ FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
$result = $query->execute(array($fileId));
+ if (\OC_DB::isError($result)) {
+ \OCP\Util::writeLog('cache', 'getFolderContents failed: '.$result->getMessage(), \OCP\Util::ERROR);
+ }
$files = $result->fetchAll();
foreach ($files as &$file) {
$file['mimetype'] = $this->getMimetype($file['mimetype']);
@@ -201,7 +204,7 @@ class Cache {
. ' VALUES(' . implode(', ', $valuesPlaceholder) . ')');
$result = $query->execute($params);
if (\OC_DB::isError($result)) {
- \OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result, \OCP\Util::ERROR);
+ \OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result->getMessage(), \OCP\Util::ERROR);
}
return (int)\OC_DB::insertid('*PREFIX*filecache');
@@ -372,6 +375,9 @@ class Cache {
$pathHash = md5($file);
$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
+ if( \OC_DB::isError($result)) {
+ \OCP\Util::writeLog('cache', 'get status failed: '.$result->getMessage(), \OCP\Util::ERROR);
+ }
if ($row = $result->fetchRow()) {
if ((int)$row['size'] === -1) {
return self::SHALLOW;
@@ -509,8 +515,11 @@ 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',1);
$result = $query->execute(array($this->getNumericStorageId()));
+ if (\OC_DB::isError($result)) {
+ \OCP\Util::writeLog('cache', 'getIncomplete failed: '.$result->getMessage(), \OCP\Util::ERROR);
+ }
if ($row = $result->fetchRow()) {
return $row['path'];
} else {
diff --git a/lib/setup.php b/lib/setup.php
index f1ac6b8b2b..6f608ec5fb 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -152,8 +152,12 @@ class OC_Setup {
self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username);
} catch (Exception $e) {
$error[] = array(
- 'error' => $l->t('Oracle username and/or password not valid'),
- 'hint' => $l->t('You need to enter either an existing account or the administrator.')
+ 'error' => $l->t('Oracle connection could not be established'),
+ 'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+ .' ORACLE_SID='.getenv('ORACLE_SID')
+ .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+ .' NLS_LANG='.getenv('NLS_LANG')
+ .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'
);
return $error;
}
@@ -452,9 +456,13 @@ class OC_Setup {
} else {
$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
}
+ \OC_Log::write('setup oracle', 'connect string: '.$easy_connect_string, \OC_Log::DEBUG);
$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
if(!$connection) {
$e = oci_error();
+ if (is_array ($e) && isset ($e['message'])) {
+ throw new Exception($e['message']);
+ }
throw new Exception($l->t('Oracle username and/or password not valid'));
}
//check for roles creation rights in oracle
diff --git a/lib/user.php b/lib/user.php
index b607874afa..78f5edfb5f 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -609,7 +609,7 @@ class OC_User {
*/
public static function isEnabled($userid) {
$sql = 'SELECT `userid` FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?';
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND to_char(`configvalue`) = ?';
$stmt = OC_DB::prepare($sql);
if ( ! OC_DB::isError($stmt) ) {
$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
diff --git a/lib/user/database.php b/lib/user/database.php
index 63c64ed43d..d70b620f2a 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -136,7 +136,7 @@ class OC_User_Database extends OC_User_Backend {
*/
public function getDisplayName($uid) {
if( $this->userExists($uid) ) {
- $query = OC_DB::prepare( 'SELECT displayname FROM `*PREFIX*users` WHERE `uid` = ?' );
+ $query = OC_DB::prepare( 'SELECT `displayname` FROM `*PREFIX*users` WHERE `uid` = ?' );
$result = $query->execute( array( $uid ))->fetchAll();
$displayName = trim($result[0]['displayname'], ' ');
if ( !empty($displayName) ) {
--
GitLab
From cbd5eb9a1a77a5bcbcb843be21e95bccec26dedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 8 May 2013 16:18:24 +0200
Subject: [PATCH 282/304] use to_char only for oracle, whitespace
---
lib/app.php | 9 +++++++--
lib/db.php | 12 ++++++------
lib/user.php | 6 +++++-
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/lib/app.php b/lib/app.php
index 0a7069ca60..c6f6e92e60 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -172,8 +172,13 @@ class OC_App{
return array();
}
$apps=array('files');
- $query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig`'
- .' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'' );
+ $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
+ .' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
+ if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
+ $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
+ .' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'';
+ }
+ $query = OC_DB::prepare( $sql );
$result=$query->execute();
if( \OC_DB::isError($result)) {
throw new DatabaseException($result->getMessage(), $query);
diff --git a/lib/db.php b/lib/db.php
index 5b45f81f99..6183655183 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -273,12 +273,12 @@ class OC_DB {
break;
case 'oci':
$dsn = array(
- 'phptype' => 'oci8',
- 'username' => $user,
- 'password' => $pass,
- 'service' => $name,
- 'hostspec' => $host,
- 'charset' => 'AL32UTF8',
+ 'phptype' => 'oci8',
+ 'username' => $user,
+ 'password' => $pass,
+ 'service' => $name,
+ 'hostspec' => $host,
+ 'charset' => 'AL32UTF8',
);
break;
case 'mssql':
diff --git a/lib/user.php b/lib/user.php
index 78f5edfb5f..32b91c35ef 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -609,7 +609,11 @@ class OC_User {
*/
public static function isEnabled($userid) {
$sql = 'SELECT `userid` FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND to_char(`configvalue`) = ?';
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?';
+ if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
+ $sql = 'SELECT `userid` FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND to_char(`configvalue`) = ?';
+ }
$stmt = OC_DB::prepare($sql);
if ( ! OC_DB::isError($stmt) ) {
$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
--
GitLab
From 1f1abe595d413883f060f5f2983bac654e0ec7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 8 May 2013 16:29:15 +0200
Subject: [PATCH 283/304] cleanup codestyle
---
lib/files/cache/cache.php | 6 +++---
lib/setup.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index adffe766dd..3341fe5052 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -148,7 +148,7 @@ class Cache {
FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
$result = $query->execute(array($fileId));
if (\OC_DB::isError($result)) {
- \OCP\Util::writeLog('cache', 'getFolderContents failed: '.$result->getMessage(), \OCP\Util::ERROR);
+ \OCP\Util::writeLog('cache', 'getFolderContents failed: ' . $result->getMessage(), \OCP\Util::ERROR);
}
$files = $result->fetchAll();
foreach ($files as &$file) {
@@ -376,7 +376,7 @@ class Cache {
$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
if( \OC_DB::isError($result)) {
- \OCP\Util::writeLog('cache', 'get status failed: '.$result->getMessage(), \OCP\Util::ERROR);
+ \OCP\Util::writeLog('cache', 'get status failed: ' . $result->getMessage(), \OCP\Util::ERROR);
}
if ($row = $result->fetchRow()) {
if ((int)$row['size'] === -1) {
@@ -518,7 +518,7 @@ class Cache {
. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC',1);
$result = $query->execute(array($this->getNumericStorageId()));
if (\OC_DB::isError($result)) {
- \OCP\Util::writeLog('cache', 'getIncomplete failed: '.$result->getMessage(), \OCP\Util::ERROR);
+ \OCP\Util::writeLog('cache', 'getIncomplete failed: ' . $result->getMessage(), \OCP\Util::ERROR);
}
if ($row = $result->fetchRow()) {
return $row['path'];
diff --git a/lib/setup.php b/lib/setup.php
index 6f608ec5fb..a63cc664db 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -456,7 +456,7 @@ class OC_Setup {
} else {
$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
}
- \OC_Log::write('setup oracle', 'connect string: '.$easy_connect_string, \OC_Log::DEBUG);
+ \OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
if(!$connection) {
$e = oci_error();
--
GitLab
From 15a3ae6db14fd021d3c9ca672a8afc98b86cf174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 22 May 2013 18:01:18 +0200
Subject: [PATCH 284/304] improved error messages
---
apps/files_encryption/ajax/adminrecovery.php | 8 +++++++-
apps/files_encryption/js/settings-admin.js | 10 +++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index a32225d036..306f0088be 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -22,6 +22,7 @@ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
$return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
+ $action = "enable";
// Disable recoveryAdmin
} elseif (
@@ -29,7 +30,12 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
&& 0 == $_POST['adminEnableRecovery']
) {
$return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
+ $action = "disable";
}
// Return success or failure
-( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
+if ($return) {
+ \OCP\JSON::success(array("data" => array( "message" => 'Recovery key successfully ' . $action.'d')));
+} else {
+ \OCP\JSON::error(array("data" => array( "message" => 'Could not '.$action.' recovery key. Please check your recovery key password!')));
+}
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index dbae42b011..c58d75341d 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -44,19 +44,19 @@ $(document).ready(function(){
$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
-
var recoveryStatus = $( this ).val();
var oldStatus = (1+parseInt(recoveryStatus)) % 2;
var recoveryPassword = $( '#recoveryPassword' ).val();
$.post(
OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
, { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
- , function( data ) {
- if (data.status == "error") {
- alert("Couldn't switch recovery key mode, please check your recovery key password!");
+ , function( result ) {
+ if (result.status === "error") {
+ OC.Notification.show(t('admin', result.data.message));
$('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
} else {
- if (recoveryStatus == "0") {
+ OC.Notification.hide();
+ if (recoveryStatus === "0") {
$('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
$('input:password[name="changeRecoveryPassword"]').attr("disabled", "true");
$('input:password[name="changeRecoveryPassword"]').val("");
--
GitLab
From 80dea1a8c5c9bab10176d1d7b04b363a9dda4bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 22 May 2013 18:05:12 +0200
Subject: [PATCH 285/304] settings clean-up; There is no blacklist in the new
encryption app
---
apps/files_encryption/settings-personal.php | 14 -------------
.../templates/settings-personal.php | 21 +------------------
2 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 90edc0eae2..ada8ffbc31 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -11,19 +11,6 @@
$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
-
-// Add human readable message in case nothing is blacklisted
-if (
- 1 == count( $blackList )
- && $blackList[0] == ''
-) {
-
- // FIXME: Make this string translatable
- $blackList[0] = "(None - all filetypes will be encrypted)";
-
-}
-
$user = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' );
$util = new \OCA\Encryption\Util( $view, $user );
@@ -36,7 +23,6 @@ $recoveryEnabledForUser = $util->recoveryEnabledForUser();
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );
-$tmpl->assign( 'blacklist', $blackList );
return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 33989416d3..14e8ce960a 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -4,28 +4,9 @@
<?php p( $l->t( 'Encryption' ) ); ?>
</legend>
- <p>
-<!-- <?php p( $l->t( 'File encryption is enabled.' ) ); ?> -->
- </p>
- <?php if ( ! empty( $_["blacklist"] ) ): ?>
- <p>
- <strong>File types</strong>
- <br />
- <?php p( $l->t( 'The following file types will not be encrypted:' ) ); ?>
- </p>
-
- <ul>
- <?php foreach( $_["blacklist"] as $type ): ?>
- <li>
- <?php p($type); ?>
- </li>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- <br />
<?php if ( $_["recoveryEnabled"] ): ?>
<p>
- <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with administrator:" ) ); ?></label>
+ <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with your administrator:" ) ); ?></label>
<br />
<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" ) ); ?></em>
<br />
--
GitLab
From 1bd42762ae6f16ab948afa2c1ab4bb5b6ad69da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 22 May 2013 18:28:44 +0200
Subject: [PATCH 286/304] revert submodule changes
---
3rdparty | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/3rdparty b/3rdparty
index 2d59ac4f7b..a13af72fbe 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee
+Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
--
GitLab
From b2aa97f1669333b6a762891f844ff4d0e79958a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 22 May 2013 18:30:29 +0200
Subject: [PATCH 287/304] revert changes to .gitmodules, they were applied by
accident
---
.gitmodules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
index 6e5521b6f5..b9c1a3702c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "3rdparty"]
path = 3rdparty
- url = git@github.com:owncloud/3rdparty.git
+ url = git://github.com/owncloud/3rdparty.git
--
GitLab
From 9b622bdeedf0f29abb33449da3089a8eaecd7c78 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 May 2013 15:02:11 -0400
Subject: [PATCH 288/304] RUNTIME_NOSETUPFS no longer exists, using
tearDownFS() in public links instead
---
apps/files_sharing/public.php | 2 +-
cron.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 2b283375a6..59598e35fa 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,5 +1,4 @@
<?php
-$RUNTIME_NOSETUPFS = true;
// Load other apps for file previews
OC_App::loadApps();
@@ -46,6 +45,7 @@ if (isset($_GET['t'])) {
$fileOwner = $shareOwner;
}
if (isset($fileOwner)) {
+ OC_Util::tearDownFS();
OC_Util::setupFS($fileOwner);
$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
}
diff --git a/cron.php b/cron.php
index 7c875843c7..69bfed8d05 100644
--- a/cron.php
+++ b/cron.php
@@ -45,7 +45,6 @@ function handleUnexpectedShutdown() {
}
}
-$RUNTIME_NOSETUPFS = true;
require_once 'lib/base.php';
session_write_close();
--
GitLab
From 842d0608f12462d38bd7c03ba9701f83f8af9ad7 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 22 May 2013 23:50:45 +0200
Subject: [PATCH 289/304] added static function registerHooks() for better unit
tests handling
---
apps/files_trashbin/appinfo/app.php | 6 ++----
apps/files_trashbin/lib/trash.php | 11 ++++++++++-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index e83d3b8fbb..3b1e0ac30c 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -3,7 +3,5 @@
OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
-//Listen to delete file signal
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
-//Listen to delete user signal
-OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
\ No newline at end of file
+// register hooks
+\OCA\Files_Trashbin\Trashbin::registerHooks();
\ No newline at end of file
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 70df9e2426..2d1830a38f 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -833,5 +833,14 @@ class Trashbin {
}
$query->execute(array($size, $user));
}
-
+
+ /**
+ * register hooks
+ */
+ public static function registerHooks() {
+ //Listen to delete file signal
+ \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
+ //Listen to delete user signal
+ \OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
+ }
}
--
GitLab
From 46c784ccdfd931fee00dd5fd760711027d0b2aec Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 22 May 2013 23:51:35 +0200
Subject: [PATCH 290/304] added trash bin tests
---
apps/files_encryption/tests/trashbin.php | 269 +++++++++++++++++++++++
1 file changed, 269 insertions(+)
create mode 100755 apps/files_encryption/tests/trashbin.php
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
new file mode 100755
index 0000000000..b62041a6d3
--- /dev/null
+++ b/apps/files_encryption/tests/trashbin.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Trashbin
+ * @brief this class provide basic trashbin app tests
+ */
+class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
+{
+
+ public $userId;
+ public $pass;
+ /**
+ * @var \OC_FilesystemView
+ */
+ public $view;
+ public $dataShort;
+ public $stateFilesTrashbin;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ function setUp()
+ {
+ // reset backend
+ \OC_User::useBackend('database');
+
+ // set user id
+ \OC_User::setUserId('admin');
+ $this->userId = 'admin';
+ $this->pass = 'admin';
+
+ // init filesystem view
+ $this->view = new \OC_FilesystemView('/');
+
+ // init short data
+ $this->dataShort = 'hats';
+
+ $this->folder1 = '/folder1';
+ $this->subfolder = '/subfolder1';
+ $this->subsubfolder = '/subsubfolder1';
+
+ \OC_Hook::clear('OC_Filesystem');
+ \OC_Hook::clear('OC_User');
+
+ // init filesystem related hooks
+ \OCA\Encryption\Helper::registerFilesystemHooks();
+
+ // register encryption file proxy
+ \OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+ // trashbin hooks
+ \OCA\Files_Trashbin\Trashbin::registerHooks();
+
+ // remember files_trashbin state
+ $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+ // we don't want to tests with app files_trashbin enabled
+ \OC_App::enable('files_trashbin');
+
+ // init filesystem for user
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_Util::setupFS($this->userId);
+ \OC_User::setUserId($this->userId);
+
+ // login user
+ $params['uid'] = $this->userId;
+ $params['password'] = $this->pass;
+ OCA\Encryption\Hooks::login($params);
+ }
+
+ function tearDown()
+ {
+ // reset app files_trashbin
+ if ($this->stateFilesTrashbin) {
+ OC_App::enable('files_trashbin');
+ } else {
+ OC_App::disable('files_trashbin');
+ }
+
+ // clear all proxies
+ \OC_FileProxy::clearProxies();
+ }
+
+ /**
+ * @brief test delete file
+ */
+ function testDeleteFile() {
+
+ // generate filename
+ $filename = 'tmp-' . time() . '.txt';
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // delete file
+ \OC\FIles\Filesystem::unlink($filename);
+
+ // check if file not exists
+ $this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // get files
+ $trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
+
+ $trashFileSuffix = null;
+ // find created file with timestamp
+ foreach($trashFiles as $file) {
+ if(strncmp($file['path'], $filename, strlen($filename))) {
+ $path_parts = pathinfo($file['name']);
+ $trashFileSuffix = $path_parts['extension'];
+ }
+ }
+
+ // check if we found the file we created
+ $this->assertNotNull($trashFileSuffix);
+
+ // check if key for admin not exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin not exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+
+ // return filename for next test
+ return $filename . '.' . $trashFileSuffix;
+ }
+
+ /**
+ * @brief test restore file
+ *
+ * @depends testDeleteFile
+ */
+ function testRestoreFile($filename) {
+
+ // prepare file information
+ $path_parts = pathinfo($filename);
+ $trashFileSuffix = $path_parts['extension'];
+ $timestamp = str_replace('d', '', $trashFileSuffix);
+ $fileNameWithoutSuffix = str_replace('.'.$trashFileSuffix, '', $filename);
+
+ // restore file
+ $this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
+
+ // check if file exists
+ $this->assertTrue($this->view->file_exists('/admin/files/' . $fileNameWithoutSuffix));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $fileNameWithoutSuffix . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $fileNameWithoutSuffix . '.admin.shareKey'));
+ }
+
+ /**
+ * @brief test delete file forever
+ */
+ function testPermanentDeleteFile() {
+
+ // generate filename
+ $filename = 'tmp-' . time() . '.txt';
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertTrue(is_int($cryptedFile));
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // delete file
+ \OC\FIles\Filesystem::unlink($filename);
+
+ // check if file not exists
+ $this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+
+ // get files
+ $trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
+
+ $trashFileSuffix = null;
+ // find created file with timestamp
+ foreach($trashFiles as $file) {
+ if(strncmp($file['path'], $filename, strlen($filename))) {
+ $path_parts = pathinfo($file['name']);
+ $trashFileSuffix = $path_parts['extension'];
+ }
+ }
+
+ // check if we found the file we created
+ $this->assertNotNull($trashFileSuffix);
+
+ // check if key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin exists
+ $this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+
+ // get timestamp from file
+ $timestamp = str_replace('d', '', $trashFileSuffix);
+
+ // delete file forever
+ $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_trashbin/files/' . $filename . '.' . $trashFileSuffix));
+
+ // check if key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+
+ // check if share key for admin not exists
+ $this->assertFalse($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+ }
+
+}
\ No newline at end of file
--
GitLab
From 698862519de6b364da6c20a97d8c546204e80f3d Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 23 May 2013 02:00:27 +0200
Subject: [PATCH 291/304] [tx-robot] updated from transifex
---
apps/files/l10n/sk_SK.php | 1 +
apps/files/l10n/tr.php | 1 +
apps/user_ldap/l10n/tr.php | 16 ++++----
l10n/sk_SK/files.po | 9 +++--
l10n/templates/core.pot | 20 ++++++----
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 | 58 +++++++++++++++--------------
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/tr/files.po | 9 +++--
l10n/tr/user_ldap.po | 23 ++++++------
17 files changed, 84 insertions(+), 71 deletions(-)
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index b7f329c362..ad33c9b4ee 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} prieÄinkov",
"1 file" => "1 súbor",
"{count} files" => "{count} súborov",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov prieÄinka. Názov \"Shared\" je rezervovaný pre ownCloud",
"Unable to rename file" => "Nemožno premenovať súbor",
"Upload" => "Odoslať",
"File handling" => "Nastavenie správania sa k súborom",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index fd5c6bc6f0..6a096d2703 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} dizin",
"1 file" => "1 dosya",
"{count} files" => "{count} dosya",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
"Unable to rename file" => "Dosya adı değiştirilemedi",
"Upload" => "Yükle",
"File handling" => "Dosya taşıma",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index c001fa99ce..3835c72313 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,16 +1,16 @@
<?php $TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Sunucu uyunlama basarmadi ",
-"The configuration is valid and the connection could be established!" => "Uyunlama mantikli ve baglama yerlestirmek edebilmi.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. ",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. ",
+"Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
+"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız.",
"Deletion failed" => "Silme başarısız oldu",
-"Take over settings from recent server configuration?" => "Parametri sonadan uyunlama cikarmak mi?",
-"Keep settings?" => "Ayarları kalsınmı?",
-"Cannot add server configuration" => "Sunucu uyunlama birlemek edemen. ",
+"Take over settings from recent server configuration?" => "Ayarları son sunucu yapılandırmalarından devral?",
+"Keep settings?" => "Ayarlar kalsın mı?",
+"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
"Error" => "Hata",
"Connection test succeeded" => "Bağlantı testi başarılı oldu",
"Connection test failed" => "Bağlantı testi başarısız oldu",
-"Do you really want to delete the current Server Configuration?" => "Hakikatten, Sonuncu Funksyon durmak istiyor mi?",
+"Do you really want to delete the current Server Configuration?" => "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
"Confirm Deletion" => "Silmeyi onayla",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin.",
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 0905075025..46a8b51b5c 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
+"PO-Revision-Date: 2013-05-22 16:10+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -217,7 +218,7 @@ msgstr "{count} súborov"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Neplatný názov prieÄinka. Názov \"Shared\" je rezervovaný pre ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a9d3136889..ebe74619f0 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index c294df5ef0..6560570071 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 4997ad02d2..5873f3e7b8 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index af78203998..004046e622 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 91ce57c6d3..953d87a720 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 23de9ceb55..4efb1b73c6 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 6c897bae2e..fccd0997a4 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index ef7c6f4003..0edba6ae59 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-05-22 02:18+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,27 +17,27 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:859
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:860
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a7651f9f1e..70a5168611 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-05-22 02:18+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f18624f277..c440c988ca 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index c6985473c6..a52cf0777f 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-05-22 02:17+0200\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 7a65c39831..204e6030a0 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
+"PO-Revision-Date: 2013-05-22 07:40+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\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"
@@ -217,7 +218,7 @@ msgstr "{count} dosya"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 576140cd31..fa75800dde 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-23 01:58+0200\n"
+"PO-Revision-Date: 2013-05-22 08:20+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\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,23 +25,23 @@ msgstr ""
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr "Sunucu uyunlama basarmadi "
+msgstr "Sunucu yapılandırmasını silme başarısız oldu"
#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
-msgstr "Uyunlama mantikli ve baglama yerlestirmek edebilmi."
+msgstr "Yapılandırma geçerli ve bağlantı kuruldu!"
#: ajax/testConfiguration.php:39
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. "
+msgstr "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz."
#: ajax/testConfiguration.php:43
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
-msgstr "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. "
+msgstr "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız."
#: js/settings.js:66
msgid "Deletion failed"
@@ -48,15 +49,15 @@ msgstr "Silme başarısız oldu"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr "Parametri sonadan uyunlama cikarmak mi?"
+msgstr "Ayarları son sunucu yapılandırmalarından devral?"
#: js/settings.js:83
msgid "Keep settings?"
-msgstr "Ayarları kalsınmı?"
+msgstr "Ayarlar kalsın mı?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr "Sunucu uyunlama birlemek edemen. "
+msgstr "Sunucu yapılandırması eklenemedi"
#: js/settings.js:111
msgid "mappings cleared"
@@ -80,7 +81,7 @@ msgstr "Bağlantı testi başarısız oldu"
#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Hakikatten, Sonuncu Funksyon durmak istiyor mi?"
+msgstr "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?"
#: js/settings.js:157
msgid "Confirm Deletion"
--
GitLab
From 3b6d850e592bbc6db9d67d25ee700c0730c84376 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 23 May 2013 10:23:16 -0400
Subject: [PATCH 292/304] Switch to calling deleteAll via storage to avoid
emitting delete hook
---
lib/files/view.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/files/view.php b/lib/files/view.php
index 8a37a0bcc6..d0d473766c 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -375,7 +375,8 @@ class View {
if ($this->is_dir($path1)) {
$result = $this->copy($path1, $path2);
if ($result === true) {
- $result = $this->deleteAll($path1);
+ list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+ $result = $storage1->deleteAll($internalPath1);
}
} else {
$source = $this->fopen($path1 . $postFix1, 'r');
--
GitLab
From a9ebf2aabe0297e2bd02a07018d6bac3b2de65c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 23 May 2013 20:30:07 +0200
Subject: [PATCH 293/304] fix public link share if a user is logged in
---
apps/files_encryption/lib/keymanager.php | 19 ++++++++++++++-----
apps/files_encryption/lib/session.php | 4 +++-
apps/files_encryption/lib/util.php | 16 +++++++++++++++-
3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index ddd8f0ad6e..58c1d4b24a 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -237,10 +237,15 @@ class Keymanager
}
$util = new Util($view, \OCP\User::getUser());
- list($owner, $filename) = $util->getUidAndFilename($filePath);
- $filePath_f = ltrim($filename, '/');
- $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ if ($util->isPublic()) {
+ $keyfilePath = $util->getKeyfilePath() . $filePath . '.key';
+ } else {
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $filePath_f = ltrim($filename, '/');
+
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+ }
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -447,9 +452,13 @@ class Keymanager
//here we need the currently logged in user, while userId can be a different user
$util = new Util($view, \OCP\User::getUser());
- list($owner, $filename) = $util->getUidAndFilename($filePath);
+ if ($util->isPublic()) {
+ $shareKeyPath = $util->getSharekeyPath() . $filePath . '.' . $userId . '.shareKey';
+ } else {
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
+ }
- $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
if ($view->file_exists($shareKeyPath)) {
$result = $view->file_get_contents($shareKeyPath);
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 8425cedd99..86f56e5676 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -84,7 +84,9 @@ class Session
}
- if (\OCP\USER::getUser() === false) {
+ if (\OCP\USER::getUser() === false ||
+ (isset($_GET['service']) && $_GET['service'] == 'files' &&
+ isset($_GET['t']))) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 784d74bd75..e327c3403b 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -129,7 +129,9 @@ class Util
$this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
// if we are anonymous/public
- if ($this->userId === false) {
+ if ($this->userId === false ||
+ (isset($_GET['service']) && $_GET['service'] == 'files' &&
+ isset($_GET['t']))) {
$this->userId = $this->publicShareKeyId;
// only handle for files_sharing app
@@ -1491,4 +1493,16 @@ class Util
$this->recoverAllFiles('/', $privateKey);
}
+
+ public function isPublic() {
+ return $this->isPublic;
+ }
+
+ public function getKeyfilePath() {
+ return $this->keyfilesPath;
+ }
+
+ public function getSharekeyPath() {
+ return $this->shareKeysPath;
+ }
}
--
GitLab
From 7b07168c46d860583f112df4b25120be296b686d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 23 May 2013 21:18:31 +0200
Subject: [PATCH 294/304] code clean up; nicer solution to solve the public
link share problem if a user is logged in
---
apps/files_encryption/lib/keymanager.php | 18 +++++-------------
apps/files_encryption/lib/util.php | 13 +------------
2 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 58c1d4b24a..a8cbc19d40 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -238,14 +238,10 @@ class Keymanager
$util = new Util($view, \OCP\User::getUser());
- if ($util->isPublic()) {
- $keyfilePath = $util->getKeyfilePath() . $filePath . '.key';
- } else {
- list($owner, $filename) = $util->getUidAndFilename($filePath);
- $filePath_f = ltrim($filename, '/');
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $filePath_f = ltrim($filename, '/');
- $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
- }
+ $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -452,12 +448,8 @@ class Keymanager
//here we need the currently logged in user, while userId can be a different user
$util = new Util($view, \OCP\User::getUser());
- if ($util->isPublic()) {
- $shareKeyPath = $util->getSharekeyPath() . $filePath . '.' . $userId . '.shareKey';
- } else {
- list($owner, $filename) = $util->getUidAndFilename($filePath);
- $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
- }
+ list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
if ($view->file_exists($shareKeyPath)) {
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index e327c3403b..d42fe9953b 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1139,7 +1139,7 @@ class Util
$fileOwnerUid = $view->getOwner($path);
// handle public access
- if ($fileOwnerUid === false && $this->isPublic) {
+ if ($this->isPublic) {
$filename = $path;
$fileOwnerUid = $GLOBALS['fileOwner'];
@@ -1494,15 +1494,4 @@ class Util
$this->recoverAllFiles('/', $privateKey);
}
- public function isPublic() {
- return $this->isPublic;
- }
-
- public function getKeyfilePath() {
- return $this->keyfilesPath;
- }
-
- public function getSharekeyPath() {
- return $this->shareKeysPath;
- }
}
--
GitLab
From adc930d9f934fab352f4b21d8aa3710ff9db239b Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 23 May 2013 22:09:28 +0200
Subject: [PATCH 295/304] added l10n support in
apps/files_encryption/ajax/adminrecovery.php
---
apps/files_encryption/ajax/adminrecovery.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 306f0088be..6d7953b563 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -13,6 +13,8 @@ use OCA\Encryption;
\OCP\JSON::checkAppEnabled('files_encryption');
\OCP\JSON::callCheck();
+$l=OC_L10N::get('files_encryption');
+
$return = false;
// Enable recoveryAdmin
@@ -35,7 +37,7 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
// Return success or failure
if ($return) {
- \OCP\JSON::success(array("data" => array( "message" => 'Recovery key successfully ' . $action.'d')));
+ \OCP\JSON::success(array("data" => array( "message" => $l->t('Recovery key successfully ' . $action.'d'))));
} else {
- \OCP\JSON::error(array("data" => array( "message" => 'Could not '.$action.' recovery key. Please check your recovery key password!')));
+ \OCP\JSON::error(array("data" => array( "message" => $l->t('Could not '.$action.' recovery key. Please check your recovery key password!'))));
}
--
GitLab
From 6c8de5ae6d11886d498e810808484a2bdfeaef12 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Thu, 23 May 2013 23:56:31 +0200
Subject: [PATCH 296/304] fixes after review from @DeepDiver1975
---
apps/files_encryption/hooks/hooks.php | 2 +-
apps/files_encryption/js/settings-admin.js | 2 +-
apps/files_encryption/js/settings-personal.js | 2 +-
apps/files_encryption/lib/crypt.php | 246 ++++---
apps/files_encryption/lib/helper.php | 92 ++-
apps/files_encryption/lib/keymanager.php | 230 ++++---
apps/files_encryption/lib/proxy.php | 204 +++---
apps/files_encryption/lib/session.php | 64 +-
apps/files_encryption/lib/stream.php | 170 +++--
apps/files_encryption/lib/util.php | 601 ++++++++----------
apps/files_encryption/settings-admin.php | 1 -
apps/files_encryption/settings-personal.php | 1 -
.../templates/settings-personal.php | 13 -
13 files changed, 752 insertions(+), 876 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 53afefc721..2066300a16 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -189,7 +189,7 @@ class Hooks {
// Save public key
$view->file_put_contents( '/public-keys/'.$user.'.public.key', $keypair['publicKey'] );
- // Encrypt private key empthy passphrase
+ // Encrypt private key empty passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $newUserPassword );
// Save private key
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index c58d75341d..7c1866445e 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -99,4 +99,4 @@ $(document).ready(function(){
);
});
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
index 3b9b00dc79..312b672ad4 100644
--- a/apps/files_encryption/js/settings-personal.js
+++ b/apps/files_encryption/js/settings-personal.js
@@ -57,4 +57,4 @@ $(document).ready(function(){
}
);
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 1a5c9300a2..f5b7a8a0a4 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -26,7 +26,7 @@
namespace OCA\Encryption;
//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
-require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath( dirname( __FILE__ ) . '/../3rdparty/Crypt_Blowfish/Blowfish.php' );
/**
* Class for common cryptography functionality
@@ -40,8 +40,7 @@ class Crypt
* @param string $user name (use system wide setting if name=null)
* @return string 'client' or 'server'
*/
- public static function mode($user = null)
- {
+ public static function mode( $user = null ) {
return 'server';
@@ -51,20 +50,19 @@ class Crypt
* @brief Create a new encryption keypair
* @return array publicKey, privatekey
*/
- public static function createKeypair()
- {
+ public static function createKeypair() {
- $res = openssl_pkey_new(array('private_key_bits' => 4096));
+ $res = openssl_pkey_new( array( 'private_key_bits' => 4096 ) );
// Get private key
- openssl_pkey_export($res, $privateKey);
+ openssl_pkey_export( $res, $privateKey );
// Get public key
- $publicKey = openssl_pkey_get_details($res);
+ $publicKey = openssl_pkey_get_details( $res );
$publicKey = $publicKey['key'];
- return (array('publicKey' => $publicKey, 'privateKey' => $privateKey));
+ return ( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
}
@@ -77,8 +75,7 @@ class Crypt
* blocks with encryption alone, hence padding is added to achieve the
* required length.
*/
- public static function addPadding($data)
- {
+ public static function addPadding( $data ) {
$padded = $data . 'xx';
@@ -91,12 +88,11 @@ class Crypt
* @param string $padded padded data to remove padding from
* @return string unpadded data on success, false on error
*/
- public static function removePadding($padded)
- {
+ public static function removePadding( $padded ) {
- if (substr($padded, -2) == 'xx') {
+ if ( substr( $padded, -2 ) == 'xx' ) {
- $data = substr($padded, 0, -2);
+ $data = substr( $padded, 0, -2 );
return $data;
@@ -115,27 +111,26 @@ class Crypt
* @return boolean
* @note see also OCA\Encryption\Util->isEncryptedPath()
*/
- public static function isCatfileContent($content)
- {
+ public static function isCatfileContent( $content ) {
- if (!$content) {
+ if ( !$content ) {
return false;
}
- $noPadding = self::removePadding($content);
+ $noPadding = self::removePadding( $content );
// Fetch encryption metadata from end of file
- $meta = substr($noPadding, -22);
+ $meta = substr( $noPadding, -22 );
// Fetch IV from end of file
- $iv = substr($meta, -16);
+ $iv = substr( $meta, -16 );
// Fetch identifier from start of metadata
- $identifier = substr($meta, 0, 6);
+ $identifier = substr( $meta, 0, 6 );
- if ($identifier == '00iv00') {
+ if ( $identifier == '00iv00' ) {
return true;
@@ -152,16 +147,15 @@ class Crypt
* @param string $path
* @return bool
*/
- public static function isEncryptedMeta($path)
- {
+ public static function isEncryptedMeta( $path ) {
// TODO: Use DI to get \OC\Files\Filesystem out of here
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo($path);
+ $metadata = \OC\Files\Filesystem::getFileInfo( $path );
// Return encryption status
- return isset($metadata['encrypted']) and ( bool )$metadata['encrypted'];
+ return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
}
@@ -172,19 +166,18 @@ class Crypt
* e.g. filename or /Docs/filename, NOT admin/files/filename
* @return boolean
*/
- public static function isLegacyEncryptedContent($data, $relPath)
- {
+ public static function isLegacyEncryptedContent( $data, $relPath ) {
// Fetch all file metadata from DB
- $metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');
+ $metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
// If a file is flagged with encryption in DB, but isn't a
// valid content + IV combination, it's probably using the
// legacy encryption system
if (
- isset($metadata['encrypted'])
+ isset( $metadata['encrypted'] )
and $metadata['encrypted'] === true
- and !self::isCatfileContent($data)
+ and !self::isCatfileContent( $data )
) {
return true;
@@ -199,18 +192,20 @@ class Crypt
/**
* @brief Symmetrically encrypt a string
+ * @param $plainContent
+ * @param $iv
+ * @param string $passphrase
* @return string encrypted file content
*/
- public static function encrypt($plainContent, $iv, $passphrase = '')
- {
+ public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
- if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
+ if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $encryptedContent;
} else {
- \OC_Log::write('Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR);
+ \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );
return false;
@@ -220,21 +215,21 @@ class Crypt
/**
* @brief Symmetrically decrypt a string
+ * @param $encryptedContent
+ * @param $iv
+ * @param $passphrase
+ * @throws \Exception
* @return string decrypted file content
*/
- public static function decrypt($encryptedContent, $iv, $passphrase)
- {
+ public static function decrypt( $encryptedContent, $iv, $passphrase ) {
- if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {
+ if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $plainContent;
-
} else {
- throw new \Exception('Encryption library: Decryption (symmetric) of content failed');
-
- return false;
+ throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
}
@@ -246,8 +241,7 @@ class Crypt
* @param string $iv IV to be concatenated
* @returns string concatenated content
*/
- public static function concatIv($content, $iv)
- {
+ public static function concatIv( $content, $iv ) {
$combined = $content . '00iv00' . $iv;
@@ -260,17 +254,16 @@ class Crypt
* @param string $catFile concatenated data to be split
* @returns array keys: encrypted, iv
*/
- public static function splitIv($catFile)
- {
+ public static function splitIv( $catFile ) {
// Fetch encryption metadata from end of file
- $meta = substr($catFile, -22);
+ $meta = substr( $catFile, -22 );
// Fetch IV from end of file
- $iv = substr($meta, -16);
+ $iv = substr( $meta, -16 );
// Remove IV and IV identifier text to expose encrypted content
- $encrypted = substr($catFile, 0, -22);
+ $encrypted = substr( $catFile, 0, -22 );
$split = array(
'encrypted' => $encrypted
@@ -290,10 +283,9 @@ class Crypt
* @note IV need not be specified, as it will be stored in the returned keyfile
* and remain accessible therein.
*/
- public static function symmetricEncryptFileContent($plainContent, $passphrase = '')
- {
+ public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
- if (!$plainContent) {
+ if ( !$plainContent ) {
return false;
@@ -301,18 +293,18 @@ class Crypt
$iv = self::generateIv();
- if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
+ if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
// Combine content to encrypt with IV identifier and actual IV
- $catfile = self::concatIv($encryptedContent, $iv);
+ $catfile = self::concatIv( $encryptedContent, $iv );
- $padded = self::addPadding($catfile);
+ $padded = self::addPadding( $catfile );
return $padded;
} else {
- \OC_Log::write('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR);
+ \OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );
return false;
@@ -334,25 +326,26 @@ class Crypt
*
* This function decrypts a file
*/
- public static function symmetricDecryptFileContent($keyfileContent, $passphrase = '')
- {
+ public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
- if (!$keyfileContent) {
+ if ( !$keyfileContent ) {
- throw new \Exception('Encryption library: no data provided for decryption');
+ throw new \Exception( 'Encryption library: no data provided for decryption' );
}
// Remove padding
- $noPadding = self::removePadding($keyfileContent);
+ $noPadding = self::removePadding( $keyfileContent );
// Split into enc data and catfile
- $catfile = self::splitIv($noPadding);
+ $catfile = self::splitIv( $noPadding );
- if ($plainContent = self::decrypt($catfile['encrypted'], $catfile['iv'], $passphrase)) {
+ if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
return $plainContent;
+ } else {
+ return false;
}
}
@@ -365,16 +358,15 @@ class Crypt
*
* This function decrypts a file
*/
- public static function symmetricEncryptFileContentKeyfile($plainContent)
- {
+ public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
$key = self::generateKey();
- if ($encryptedContent = self::symmetricEncryptFileContent($plainContent, $key)) {
+ if ( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
return array(
- 'key' => $key
- , 'encrypted' => $encryptedContent
+ 'key' => $key,
+ 'encrypted' => $encryptedContent
);
} else {
@@ -392,29 +384,28 @@ class Crypt
* @returns array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
- public static function multiKeyEncrypt($plainContent, array $publicKeys)
- {
+ public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
// openssl_seal returns false without errors if $plainContent
// is empty, so trigger our own error
- if (empty($plainContent)) {
+ if ( empty( $plainContent ) ) {
- trigger_error("Cannot mutliKeyEncrypt empty plain content");
- throw new \Exception('Cannot mutliKeyEncrypt empty plain content');
+ throw new \Exception( 'Cannot mutliKeyEncrypt empty plain content' );
}
// Set empty vars to be set by openssl by reference
$sealed = '';
$shareKeys = array();
+ $mappedShareKeys = array();
- if (openssl_seal($plainContent, $sealed, $shareKeys, $publicKeys)) {
+ if ( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {
$i = 0;
// Ensure each shareKey is labelled with its
// corresponding userId
- foreach ($publicKeys as $userId => $publicKey) {
+ foreach ( $publicKeys as $userId => $publicKey ) {
$mappedShareKeys[$userId] = $shareKeys[$i];
$i++;
@@ -422,8 +413,8 @@ class Crypt
}
return array(
- 'keys' => $mappedShareKeys
- , 'data' => $sealed
+ 'keys' => $mappedShareKeys,
+ 'data' => $sealed
);
} else {
@@ -446,22 +437,21 @@ class Crypt
*
* This function decrypts a file
*/
- public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey)
- {
+ public static function multiKeyDecrypt( $encryptedContent, $shareKey, $privateKey ) {
- if (!$encryptedContent) {
+ if ( !$encryptedContent ) {
return false;
}
- if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {
+ if ( openssl_open( $encryptedContent, $plainContent, $shareKey, $privateKey ) ) {
return $plainContent;
} else {
- \OC_Log::write('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR);
+ \OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
return false;
@@ -473,10 +463,9 @@ class Crypt
* @brief Asymetrically encrypt a string using a public key
* @return string encrypted file
*/
- public static function keyEncrypt($plainContent, $publicKey)
- {
+ public static function keyEncrypt( $plainContent, $publicKey ) {
- openssl_public_encrypt($plainContent, $encryptedContent, $publicKey);
+ openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
return $encryptedContent;
@@ -486,12 +475,11 @@ class Crypt
* @brief Asymetrically decrypt a file using a private key
* @return string decrypted file
*/
- public static function keyDecrypt($encryptedContent, $privatekey)
- {
+ public static function keyDecrypt( $encryptedContent, $privatekey ) {
- $result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);
+ $result = @openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
- if ($result) {
+ if ( $result ) {
return $plainContent;
}
@@ -503,27 +491,26 @@ class Crypt
* @brief Generates a pseudo random initialisation vector
* @return String $iv generated IV
*/
- public static function generateIv()
- {
+ public static function generateIv() {
- if ($random = openssl_random_pseudo_bytes(12, $strong)) {
+ if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
- if (!$strong) {
+ if ( !$strong ) {
// If OpenSSL indicates randomness is insecure, log error
- \OC_Log::write('Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN);
+ \OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );
}
// We encode the iv purely for string manipulation
// purposes - it gets decoded before use
- $iv = base64_encode($random);
+ $iv = base64_encode( $random );
return $iv;
} else {
- throw new \Exception('Generating IV failed');
+ throw new \Exception( 'Generating IV failed' );
}
@@ -533,16 +520,15 @@ class Crypt
* @brief Generate a pseudo random 1024kb ASCII key
* @returns $key Generated key
*/
- public static function generateKey()
- {
+ public static function generateKey() {
// Generate key
- if ($key = base64_encode(openssl_random_pseudo_bytes(183, $strong))) {
+ if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
- if (!$strong) {
+ if ( !$strong ) {
// If OpenSSL indicates randomness is insecure, log error
- throw new \Exception('Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()');
+ throw new \Exception( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
}
@@ -563,12 +549,11 @@ class Crypt
*
* if the key is left out, the default handeler will be used
*/
- public static function getBlowfish($key = '')
- {
+ public static function getBlowfish( $key = '' ) {
- if ($key) {
+ if ( $key ) {
- return new \Crypt_Blowfish($key);
+ return new \Crypt_Blowfish( $key );
} else {
@@ -582,14 +567,13 @@ class Crypt
* @param $passphrase
* @return mixed
*/
- public static function legacyCreateKey($passphrase)
- {
+ public static function legacyCreateKey( $passphrase ) {
// Generate a random integer
- $key = mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999);
+ $key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
// Encrypt the key with the passphrase
- $legacyEncKey = self::legacyEncrypt($key, $passphrase);
+ $legacyEncKey = self::legacyEncrypt( $key, $passphrase );
return $legacyEncKey;
@@ -605,12 +589,11 @@ class Crypt
*
* This function encrypts an content
*/
- public static function legacyEncrypt($content, $passphrase = '')
- {
+ public static function legacyEncrypt( $content, $passphrase = '' ) {
- $bf = self::getBlowfish($passphrase);
+ $bf = self::getBlowfish( $passphrase );
- return $bf->encrypt($content);
+ return $bf->encrypt( $content );
}
@@ -624,14 +607,13 @@ class Crypt
*
* This function decrypts an content
*/
- public static function legacyDecrypt($content, $passphrase = '')
- {
+ public static function legacyDecrypt( $content, $passphrase = '' ) {
- $bf = self::getBlowfish($passphrase);
+ $bf = self::getBlowfish( $passphrase );
- $decrypted = $bf->decrypt($content);
+ $decrypted = $bf->decrypt( $content );
- return rtrim($decrypted, "\0");;
+ return rtrim( $decrypted, "\0" );;
}
@@ -641,17 +623,16 @@ class Crypt
* @param int $maxLength
* @return string
*/
- private static function legacyBlockDecrypt($data, $key = '', $maxLength = 0)
- {
+ private static function legacyBlockDecrypt( $data, $key = '', $maxLength = 0 ) {
$result = '';
- while (strlen($data)) {
- $result .= self::legacyDecrypt(substr($data, 0, 8192), $key);
- $data = substr($data, 8192);
+ while ( strlen( $data ) ) {
+ $result .= self::legacyDecrypt( substr( $data, 0, 8192 ), $key );
+ $data = substr( $data, 8192 );
}
- if ($maxLength > 0) {
- return substr($result, 0, $maxLength);
+ if ( $maxLength > 0 ) {
+ return substr( $result, 0, $maxLength );
} else {
- return rtrim($result, "\0");
+ return rtrim( $result, "\0" );
}
}
@@ -663,18 +644,17 @@ class Crypt
* @param $path
* @return array
*/
- public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path)
- {
+ public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {
- $decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);
+ $decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );
// Encrypt plain data, generate keyfile & encrypted file
- $cryptedData = self::symmetricEncryptFileContentKeyfile($decrypted);
+ $cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );
// Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);
+ $multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );
- return array('data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys']);
+ return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );
}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index e4bf2c1226..43f573c16b 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -37,35 +37,32 @@ class Helper
* @brief register share related hooks
*
*/
- public static function registerShareHooks()
- {
+ public static function registerShareHooks() {
- \OCP\Util::connectHook('OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared');
- \OCP\Util::connectHook('OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared');
- \OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare');
+ \OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
+ \OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
}
/**
* @brief register user related hooks
*
*/
- public static function registerUserHooks()
- {
+ public static function registerUserHooks() {
- \OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login');
- \OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase');
- \OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
- \OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
+ \OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
+ \OCP\Util::connectHook( 'OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+ \OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
+ \OCP\Util::connectHook( 'OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser' );
}
/**
* @brief register filesystem related hooks
*
*/
- public static function registerFilesystemHooks()
- {
+ public static function registerFilesystemHooks() {
- \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+ \OCP\Util::connectHook( 'OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename' );
}
/**
@@ -75,14 +72,13 @@ class Helper
* @param string $password
* @return bool
*/
- public static function setupUser($util, $password)
- {
+ public static function setupUser( $util, $password ) {
// Check files_encryption infrastructure is ready for action
- if (!$util->ready()) {
+ if ( !$util->ready() ) {
- \OC_Log::write('Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG);
+ \OC_Log::write( 'Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
- if (!$util->setupServerSide($password)) {
+ if ( !$util->setupServerSide( $password ) ) {
return false;
}
}
@@ -99,22 +95,21 @@ class Helper
* @internal param string $password
* @return bool
*/
- public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword)
- {
- $view = new \OC\Files\View('/');
+ public static function adminEnableRecovery( $recoveryKeyId, $recoveryPassword ) {
+ $view = new \OC\Files\View( '/' );
- if ($recoveryKeyId === null) {
- $recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
- \OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
+ if ( $recoveryKeyId === null ) {
+ $recoveryKeyId = 'recovery_' . substr( md5( time() ), 0, 8 );
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryKeyId', $recoveryKeyId );
}
- if (!$view->is_dir('/owncloud_private_key')) {
- $view->mkdir('/owncloud_private_key');
+ if ( !$view->is_dir( '/owncloud_private_key' ) ) {
+ $view->mkdir( '/owncloud_private_key' );
}
if (
- (!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
- || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
+ ( !$view->file_exists( "/public-keys/" . $recoveryKeyId . ".public.key" )
+ || !$view->file_exists( "/owncloud_private_key/" . $recoveryKeyId . ".private.key" ) )
) {
$keypair = \OCA\Encryption\Crypt::createKeypair();
@@ -123,37 +118,37 @@ class Helper
// Save public key
- if (!$view->is_dir('/public-keys')) {
- $view->mkdir('/public-keys');
+ if ( !$view->is_dir( '/public-keys' ) ) {
+ $view->mkdir( '/public-keys' );
}
- $view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
+ $view->file_put_contents( '/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey'] );
// Encrypt private key empthy passphrase
- $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
+ $encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $recoveryPassword );
// Save private key
- $view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
+ $view->file_put_contents( '/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey );
// create control file which let us check later on if the entered password was correct.
- $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
- if (!$view->is_dir('/control-file')) {
- $view->mkdir('/control-file');
+ $encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt( "ownCloud", $keypair['publicKey'] );
+ if ( !$view->is_dir( '/control-file' ) ) {
+ $view->mkdir( '/control-file' );
}
- $view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
+ $view->file_put_contents( '/control-file/controlfile.enc', $encryptedControlData );
\OC_FileProxy::$enabled = true;
// Set recoveryAdmin as enabled
- \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
$return = true;
} else { // get recovery key and check the password
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
- $return = $util->checkRecoveryPassword($_POST['recoveryPassword']);
- if ($return) {
- \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+ $util = new \OCA\Encryption\Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
+ $return = $util->checkRecoveryPassword( $_POST['recoveryPassword'] );
+ if ( $return ) {
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
}
}
@@ -167,14 +162,13 @@ class Helper
* @param $recoveryPassword
* @return bool
*/
- public static function adminDisableRecovery($recoveryPassword)
- {
- $util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
- $return = $util->checkRecoveryPassword($recoveryPassword);
+ public static function adminDisableRecovery( $recoveryPassword ) {
+ $util = new Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
+ $return = $util->checkRecoveryPassword( $recoveryPassword );
- if ($return) {
+ if ( $return ) {
// Set recoveryAdmin as disabled
- \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
+ \OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 0 );
}
return $return;
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index a8cbc19d40..aaa2e4ba1b 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -38,15 +38,14 @@ class Keymanager
* @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
- public static function getPrivateKey(\OC_FilesystemView $view, $user)
- {
+ public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $key = $view->file_get_contents($path);
+ $key = $view->file_get_contents( $path );
\OC_FileProxy::$enabled = $proxyStatus;
@@ -59,13 +58,12 @@ class Keymanager
* @param $userId
* @return string public key or false
*/
- public static function getPublicKey(\OC_FilesystemView $view, $userId)
- {
+ public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
+ $result = $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
\OC_FileProxy::$enabled = $proxyStatus;
@@ -79,12 +77,11 @@ class Keymanager
* @param $userId
* @return array keys: privateKey, publicKey
*/
- public static function getUserKeys(\OC_FilesystemView $view, $userId)
- {
+ public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
return array(
- 'publicKey' => self::getPublicKey($view, $userId)
- , 'privateKey' => self::getPrivateKey($view, $userId)
+ 'publicKey' => self::getPublicKey( $view, $userId )
+ , 'privateKey' => self::getPrivateKey( $view, $userId )
);
}
@@ -95,14 +92,13 @@ class Keymanager
* @param array $userIds
* @return array of public keys for the specified users
*/
- public static function getPublicKeys(\OC_FilesystemView $view, array $userIds)
- {
+ public static function getPublicKeys( \OC_FilesystemView $view, array $userIds ) {
$keys = array();
- foreach ($userIds as $userId) {
+ foreach ( $userIds as $userId ) {
- $keys[$userId] = self::getPublicKey($view, $userId);
+ $keys[$userId] = self::getPublicKey( $view, $userId );
}
@@ -122,41 +118,40 @@ class Keymanager
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- public static function setFileKey(\OC_FilesystemView $view, $path, $userId, $catfile)
- {
+ public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util($view, \OCP\User::getUser());
- list($owner, $filename) = $util->getUidAndFilename($path);
+ $util = new Util( $view, \OCP\User::getUser() );
+ list( $owner, $filename ) = $util->getUidAndFilename( $path );
$basePath = '/' . $owner . '/files_encryption/keyfiles';
- $targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+ $targetPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
- if (!$view->is_dir($basePath . '/' . $targetPath)) {
+ if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
// create all parent folders
- $info = pathinfo($basePath . '/' . $targetPath);
- $keyfileFolderName = $view->getLocalFolder($info['dirname']);
+ $info = pathinfo( $basePath . '/' . $targetPath );
+ $keyfileFolderName = $view->getLocalFolder( $info['dirname'] );
- if (!file_exists($keyfileFolderName)) {
+ if ( !file_exists( $keyfileFolderName ) ) {
- mkdir($keyfileFolderName, 0750, true);
+ mkdir( $keyfileFolderName, 0750, true );
}
}
// try reusing key file if part file
- if (self::isPartialFilePath($targetPath)) {
+ if ( self::isPartialFilePath( $targetPath ) ) {
- $result = $view->file_put_contents($basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile);
+ $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
} else {
- $result = $view->file_put_contents($basePath . '/' . $targetPath . '.key', $catfile);
+ $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
}
@@ -172,13 +167,12 @@ class Keymanager
* @return string File path without .part extension
* @note this is needed for reusing keys
*/
- public static function fixPartialFilePath($path)
- {
+ public static function fixPartialFilePath( $path ) {
- if (preg_match('/\.part$/', $path)) {
+ if ( preg_match( '/\.part$/', $path ) ) {
- $newLength = strlen($path) - 5;
- $fPath = substr($path, 0, $newLength);
+ $newLength = strlen( $path ) - 5;
+ $fPath = substr( $path, 0, $newLength );
return $fPath;
@@ -195,10 +189,9 @@ class Keymanager
* @param string $path Path that may identify a .part file
* @return bool
*/
- public static function isPartialFilePath($path)
- {
+ public static function isPartialFilePath( $path ) {
- if (preg_match('/\.part$/', $path)) {
+ if ( preg_match( '/\.part$/', $path ) ) {
return true;
@@ -220,15 +213,14 @@ class Keymanager
* @note The keyfile returned is asymmetrically encrypted. Decryption
* of the keyfile must be performed by client code
*/
- public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath)
- {
+ public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
// try reusing key file if part file
- if (self::isPartialFilePath($filePath)) {
+ if ( self::isPartialFilePath( $filePath ) ) {
- $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
+ $result = self::getFileKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
- if ($result) {
+ if ( $result ) {
return $result;
@@ -236,19 +228,19 @@ class Keymanager
}
- $util = new Util($view, \OCP\User::getUser());
+ $util = new Util( $view, \OCP\User::getUser() );
- list($owner, $filename) = $util->getUidAndFilename($filePath);
- $filePath_f = ltrim($filename, '/');
+ list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
+ $filePath_f = ltrim( $filename, '/' );
$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if ($view->file_exists($keyfilePath)) {
+ if ( $view->file_exists( $keyfilePath ) ) {
- $result = $view->file_get_contents($keyfilePath);
+ $result = $view->file_get_contents( $keyfilePath );
} else {
@@ -272,27 +264,26 @@ class Keymanager
* @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
* /data/admin/files/mydoc.txt
*/
- public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path)
- {
+ public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
- $trimmed = ltrim($path, '/');
+ $trimmed = ltrim( $path, '/' );
$keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
$result = false;
- if ($view->is_dir($keyPath)) {
+ if ( $view->is_dir( $keyPath ) ) {
- $result = $view->unlink($keyPath);
+ $result = $view->unlink( $keyPath );
- } else if ($view->file_exists($keyPath . '.key')) {
+ } else if ( $view->file_exists( $keyPath . '.key' ) ) {
- $result = $view->unlink($keyPath . '.key');
+ $result = $view->unlink( $keyPath . '.key' );
}
- if (!$result) {
+ if ( !$result ) {
- \OC_Log::write('Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR);
+ \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
}
@@ -307,19 +298,19 @@ class Keymanager
* @note Encryption of the private key must be performed by client code
* as no encryption takes place here
*/
- public static function setPrivateKey($key)
- {
+ public static function setPrivateKey( $key ) {
$user = \OCP\User::getUser();
- $view = new \OC_FilesystemView('/' . $user . '/files_encryption');
+ $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if (!$view->file_exists('')) $view->mkdir('');
+ if ( !$view->file_exists( '' ) )
+ $view->mkdir( '' );
- $result = $view->file_put_contents($user . '.private.key', $key);
+ $result = $view->file_put_contents( $user . '.private.key', $key );
\OC_FileProxy::$enabled = $proxyStatus;
@@ -340,22 +331,21 @@ class Keymanager
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- public static function setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey)
- {
+ public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
// Here we need the currently logged in user, while userId can be a different user
- $util = new Util($view, \OCP\User::getUser());
+ $util = new Util( $view, \OCP\User::getUser() );
- list($owner, $filename) = $util->getUidAndFilename($path);
+ list( $owner, $filename ) = $util->getUidAndFilename( $path );
$basePath = '/' . $owner . '/files_encryption/share-keys';
- $shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+ $shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
// try reusing key file if part file
- if (self::isPartialFilePath($shareKeyPath)) {
+ if ( self::isPartialFilePath( $shareKeyPath ) ) {
- $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+ $writePath = $basePath . '/' . self::fixPartialFilePath( $shareKeyPath ) . '.' . $userId . '.shareKey';
} else {
@@ -366,12 +356,12 @@ class Keymanager
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $result = $view->file_put_contents($writePath, $shareKey);
+ $result = $view->file_put_contents( $writePath, $shareKey );
\OC_FileProxy::$enabled = $proxyStatus;
if (
- is_int($result)
+ is_int( $result )
&& $result > 0
) {
@@ -392,17 +382,16 @@ class Keymanager
* @param array $shareKeys
* @return bool
*/
- public static function setShareKeys(\OC_FilesystemView $view, $path, array $shareKeys)
- {
+ public static function setShareKeys( \OC_FilesystemView $view, $path, array $shareKeys ) {
// $shareKeys must be an array with the following format:
// [userId] => [encrypted key]
$result = true;
- foreach ($shareKeys as $userId => $shareKey) {
+ foreach ( $shareKeys as $userId => $shareKey ) {
- if (!self::setShareKey($view, $path, $userId, $shareKey)) {
+ if ( !self::setShareKey( $view, $path, $userId, $shareKey ) ) {
// If any of the keys are not set, flag false
$result = false;
@@ -426,15 +415,14 @@ class Keymanager
* @note The sharekey returned is encrypted. Decryption
* of the keyfile must be performed by client code
*/
- public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath)
- {
+ public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
// try reusing key file if part file
- if (self::isPartialFilePath($filePath)) {
+ if ( self::isPartialFilePath( $filePath ) ) {
- $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
+ $result = self::getShareKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
- if ($result) {
+ if ( $result ) {
return $result;
@@ -446,14 +434,14 @@ class Keymanager
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util($view, \OCP\User::getUser());
+ $util = new Util( $view, \OCP\User::getUser() );
- list($owner, $filename) = $util->getUidAndFilename($filePath);
- $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
+ list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey' );
- if ($view->file_exists($shareKeyPath)) {
+ if ( $view->file_exists( $shareKeyPath ) ) {
- $result = $view->file_get_contents($shareKeyPath);
+ $result = $view->file_get_contents( $shareKeyPath );
} else {
@@ -473,16 +461,18 @@ class Keymanager
* @param string $userId owner of the file
* @param string $filePath path to the file, relative to the owners file dir
*/
- public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath)
- {
+ public static function delAllShareKeys( \OC_FilesystemView $view, $userId, $filePath ) {
- if ($view->is_dir($userId . '/files/' . $filePath)) {
- $view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
+ if ( $view->is_dir( $userId . '/files/' . $filePath ) ) {
+ $view->unlink( $userId . '/files_encryption/share-keys/' . $filePath );
} else {
- $localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
- $matches = glob(preg_quote($localKeyPath) . '*.shareKey');
- foreach ($matches as $ma) {
- unlink($ma);
+ $localKeyPath = $view->getLocalFile( $userId . '/files_encryption/share-keys/' . $filePath );
+ $matches = glob( preg_quote( $localKeyPath ) . '*.shareKey' );
+ foreach ( $matches as $ma ) {
+ $result = unlink( $ma );
+ if ( !$result ) {
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OC_Log::ERROR );
+ }
}
}
}
@@ -490,30 +480,29 @@ class Keymanager
/**
* @brief Delete a single user's shareKey for a single file
*/
- public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath)
- {
+ public static function delShareKey( \OC_FilesystemView $view, $userIds, $filePath ) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//here we need the currently logged in user, while userId can be a different user
- $util = new Util($view, \OCP\User::getUser());
+ $util = new Util( $view, \OCP\User::getUser() );
- list($owner, $filename) = $util->getUidAndFilename($filePath);
+ list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
- $shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+ $shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename );
- if ($view->is_dir($shareKeyPath)) {
+ if ( $view->is_dir( $shareKeyPath ) ) {
- $localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
- self::recursiveDelShareKeys($localPath, $userIds);
+ $localPath = \OC\Files\Filesystem::normalizePath( $view->getLocalFolder( $shareKeyPath ) );
+ self::recursiveDelShareKeys( $localPath, $userIds );
} else {
- foreach ($userIds as $userId) {
+ foreach ( $userIds as $userId ) {
- if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
- \OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR);
+ if ( !$view->unlink( $shareKeyPath . '.' . $userId . '.shareKey' ) ) {
+ \OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR );
}
}
@@ -528,45 +517,42 @@ class Keymanager
* @param string $dir directory
* @param array $userIds user ids for which the share keys should be deleted
*/
- private static function recursiveDelShareKeys($dir, $userIds)
- {
- foreach ($userIds as $userId) {
- $completePath = $dir . '/.*' . '.' . $userId . '.shareKey';
- $matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
+ private static function recursiveDelShareKeys( $dir, $userIds ) {
+ foreach ( $userIds as $userId ) {
+ $matches = glob( preg_quote( $dir ) . '/*' . preg_quote( '.' . $userId . '.shareKey' ) );
}
/** @var $matches array */
- foreach ($matches as $ma) {
- if (!unlink($ma)) {
- \OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR);
+ foreach ( $matches as $ma ) {
+ if ( !unlink( $ma ) ) {
+ \OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR );
}
}
- $subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
- foreach ($subdirs as $subdir) {
- self::recursiveDelShareKeys($subdir, $userIds);
+ $subdirs = $directories = glob( preg_quote( $dir ) . '/*', GLOB_ONLYDIR );
+ foreach ( $subdirs as $subdir ) {
+ self::recursiveDelShareKeys( $subdir, $userIds );
}
}
/**
* @brief Make preparations to vars and filesystem for saving a keyfile
*/
- public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId)
- {
+ public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
- $targetPath = ltrim($path, '/');
+ $targetPath = ltrim( $path, '/' );
- $path_parts = pathinfo($targetPath);
+ $path_parts = pathinfo( $targetPath );
// If the file resides within a subdirectory, create it
if (
- isset($path_parts['dirname'])
- && !$view->file_exists($basePath . '/' . $path_parts['dirname'])
+ isset( $path_parts['dirname'] )
+ && !$view->file_exists( $basePath . '/' . $path_parts['dirname'] )
) {
- $sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
+ $sub_dirs = explode( DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname'] );
$dir = '';
- foreach ($sub_dirs as $sub_dir) {
+ foreach ( $sub_dirs as $sub_dir ) {
$dir .= '/' . $sub_dir;
- if (!$view->is_dir($dir)) {
- $view->mkdir($dir);
+ if ( !$view->is_dir( $dir ) ) {
+ $view->mkdir( $dir );
}
}
}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index cc9d239b25..eaaeae9b61 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -48,13 +48,12 @@ class Proxy extends \OC_FileProxy
*
* Tests if server side encryption is enabled, and file is allowed by blacklists
*/
- private static function shouldEncrypt($path)
- {
+ private static function shouldEncrypt( $path ) {
- if (is_null(self::$enableEncryption)) {
+ if ( is_null( self::$enableEncryption ) ) {
if (
- \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') == 'true'
+ \OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
&& Crypt::mode() == 'server'
) {
@@ -68,27 +67,27 @@ class Proxy extends \OC_FileProxy
}
- if (!self::$enableEncryption) {
+ if ( !self::$enableEncryption ) {
return false;
}
- if (is_null(self::$blackList)) {
+ if ( is_null( self::$blackList ) ) {
- self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
+ self::$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
}
- if (Crypt::isCatfileContent($path)) {
+ if ( Crypt::isCatfileContent( $path ) ) {
return true;
}
- $extension = substr($path, strrpos($path, '.') + 1);
+ $extension = substr( $path, strrpos( $path, '.' ) + 1 );
- if (array_search($extension, self::$blackList) === false) {
+ if ( array_search( $extension, self::$blackList ) === false ) {
return true;
@@ -102,35 +101,34 @@ class Proxy extends \OC_FileProxy
* @param $data
* @return bool
*/
- public function preFile_put_contents($path, &$data)
- {
+ public function preFile_put_contents( $path, &$data ) {
- if (self::shouldEncrypt($path)) {
+ if ( self::shouldEncrypt( $path ) ) {
// Stream put contents should have been converted to fopen
- if (!is_resource($data)) {
+ if ( !is_resource( $data ) ) {
$userId = \OCP\USER::getUser();
- $view = new \OC_FilesystemView('/');
- $util = new Util($view, $userId);
- $session = new Session($view);
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
+ $session = new Session( $view );
$privateKey = $session->getPrivateKey();
- $filePath = $util->stripUserFilesPath($path);
+ $filePath = $util->stripUserFilesPath( $path );
// Set the filesize for userland, before encrypting
- $size = strlen($data);
+ $size = strlen( $data );
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// Check if there is an existing key we can reuse
- if ($encKeyfile = Keymanager::getFileKey($view, $userId, $filePath)) {
+ if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
// Fetch shareKey
- $shareKey = Keymanager::getShareKey($view, $userId, $filePath);
+ $shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
// Decrypt the keyfile
- $plainKey = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+ $plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
} else {
@@ -140,37 +138,37 @@ class Proxy extends \OC_FileProxy
}
// Encrypt data
- $encData = Crypt::symmetricEncryptFileContent($data, $plainKey);
+ $encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
$sharingEnabled = \OCP\Share::isEnabled();
// if file exists try to get sharing users
- if ($view->file_exists($path)) {
- $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $filePath, $userId);
+ if ( $view->file_exists( $path ) ) {
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
} else {
$uniqueUserIds[] = $userId;
}
// Fetch public keys for all users who will share the file
- $publicKeys = Keymanager::getPublicKeys($view, $uniqueUserIds);
+ $publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
// Encrypt plain keyfile to multiple sharefiles
- $multiEncrypted = Crypt::multiKeyEncrypt($plainKey, $publicKeys);
+ $multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
// Save sharekeys to user folders
- Keymanager::setShareKeys($view, $filePath, $multiEncrypted['keys']);
+ Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
// Set encrypted keyfile as common varname
$encKey = $multiEncrypted['data'];
// Save keyfile for newly encrypted file in parallel directory tree
- Keymanager::setFileKey($view, $filePath, $userId, $encKey);
+ Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
// Replace plain content with encrypted content by reference
$data = $encData;
// Update the file cache with file info
- \OC\Files\Filesystem::putFileInfo($filePath, array('encrypted' => true, 'size' => strlen($data), 'unencrypted_size' => $size), '');
+ \OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted' => true, 'size' => strlen( $data ), 'unencrypted_size' => $size ), '' );
// Re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
@@ -186,52 +184,51 @@ class Proxy extends \OC_FileProxy
* @param string $path Path of file from which has been read
* @param string $data Data that has been read from file
*/
- public function postFile_get_contents($path, $data)
- {
+ public function postFile_get_contents( $path, $data ) {
$userId = \OCP\USER::getUser();
- $view = new \OC_FilesystemView('/');
- $util = new Util($view, $userId);
+ $view = new \OC_FilesystemView( '/' );
+ $util = new Util( $view, $userId );
- $relPath = $util->stripUserFilesPath($path);
+ $relPath = $util->stripUserFilesPath( $path );
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// init session
- $session = new Session($view);
+ $session = new Session( $view );
// If data is a catfile
if (
Crypt::mode() == 'server'
- && Crypt::isCatfileContent($data)
+ && Crypt::isCatfileContent( $data )
) {
- $privateKey = $session->getPrivateKey($userId);
+ $privateKey = $session->getPrivateKey( $userId );
// Get the encrypted keyfile
- $encKeyfile = Keymanager::getFileKey($view, $userId, $relPath);
+ $encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
// Attempt to fetch the user's shareKey
- $shareKey = Keymanager::getShareKey($view, $userId, $relPath);
+ $shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
// Decrypt keyfile with shareKey
- $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
- $plainData = Crypt::symmetricDecryptFileContent($data, $plainKeyfile);
+ $plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
} elseif (
Crypt::mode() == 'server'
- && isset($_SESSION['legacyenckey'])
- && Crypt::isEncryptedMeta($path)
+ && isset( $_SESSION['legacyenckey'] )
+ && Crypt::isEncryptedMeta( $path )
) {
- $plainData = Crypt::legacyDecrypt($data, $session->getLegacyKey());
+ $plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
}
\OC_FileProxy::$enabled = $proxyStatus;
- if (!isset($plainData)) {
+ if ( !isset( $plainData ) ) {
$plainData = $data;
@@ -244,11 +241,10 @@ class Proxy extends \OC_FileProxy
/**
* @brief When a file is deleted, remove its keyfile also
*/
- public function preUnlink($path)
- {
+ public function preUnlink( $path ) {
// let the trashbin handle this
- if (\OCP\App::isEnabled('files_trashbin')) {
+ if ( \OCP\App::isEnabled( 'files_trashbin' ) ) {
return true;
}
@@ -256,29 +252,24 @@ class Proxy extends \OC_FileProxy
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $view = new \OC_FilesystemView('/');
+ $view = new \OC_FilesystemView( '/' );
$userId = \OCP\USER::getUser();
- $util = new Util($view, $userId);
+ $util = new Util( $view, $userId );
// Format path to be relative to user files dir
- $relPath = $util->stripUserFilesPath($path);
+ $relPath = $util->stripUserFilesPath( $path );
- list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
+ list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
// Delete keyfile & shareKey so it isn't orphaned
- if (
- !(
- Keymanager::deleteFileKey($view, $owner, $ownerPath)
- && Keymanager::delAllShareKeys($view, $owner, $ownerPath)
- )
- ) {
-
- \OC_Log::write('Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR);
-
+ if ( !Keymanager::deleteFileKey( $view, $owner, $ownerPath ) ) {
+ \OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR );
}
+ Keymanager::delAllShareKeys( $view, $owner, $ownerPath );
+
\OC_FileProxy::$enabled = $proxyStatus;
// If we don't return true then file delete will fail; better
@@ -291,9 +282,8 @@ class Proxy extends \OC_FileProxy
* @param $path
* @return bool
*/
- public function postTouch($path)
- {
- $this->handleFile($path);
+ public function postTouch( $path ) {
+ $this->handleFile( $path );
return true;
}
@@ -303,21 +293,20 @@ class Proxy extends \OC_FileProxy
* @param $result
* @return resource
*/
- public function postFopen($path, &$result)
- {
+ public function postFopen( $path, &$result ) {
- if (!$result) {
+ if ( !$result ) {
return $result;
}
// Reformat path for use with OC_FSV
- $path_split = explode('/', $path);
- $path_f = implode('/', array_slice($path_split, 3));
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
// FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
- if ($path_split[2] == 'cache') {
+ if ( count($path_split) >= 2 && $path_split[2] == 'cache' ) {
return $result;
}
@@ -325,31 +314,31 @@ class Proxy extends \OC_FileProxy
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $meta = stream_get_meta_data($result);
+ $meta = stream_get_meta_data( $result );
- $view = new \OC_FilesystemView('');
+ $view = new \OC_FilesystemView( '' );
- $util = new Util($view, \OCP\USER::getUser());
+ $util = new Util( $view, \OCP\USER::getUser() );
// If file is already encrypted, decrypt using crypto protocol
if (
Crypt::mode() == 'server'
- && $util->isEncryptedPath($path)
+ && $util->isEncryptedPath( $path )
) {
// Close the original encrypted file
- fclose($result);
+ fclose( $result );
// Open the file using the crypto stream wrapper
// protocol and let it do the decryption work instead
- $result = fopen('crypt://' . $path_f, $meta['mode']);
+ $result = fopen( 'crypt://' . $path_f, $meta['mode'] );
} elseif (
- self::shouldEncrypt($path)
+ self::shouldEncrypt( $path )
and $meta ['mode'] != 'r'
and $meta['mode'] != 'rb'
) {
- $result = fopen('crypt://' . $path_f, $meta['mode']);
+ $result = fopen( 'crypt://' . $path_f, $meta['mode'] );
}
// Re-enable the proxy
@@ -364,18 +353,17 @@ class Proxy extends \OC_FileProxy
* @param $data
* @return array
*/
- public function postGetFileInfo($path, $data)
- {
+ public function postGetFileInfo( $path, $data ) {
// if path is a folder do nothing
- if (is_array($data) && array_key_exists('size', $data)) {
+ if ( is_array( $data ) && array_key_exists( 'size', $data ) ) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
// get file size
- $data['size'] = self::postFileSize($path, $data['size']);
+ $data['size'] = self::postFileSize( $path, $data['size'] );
// Re-enable the proxy
\OC_FileProxy::$enabled = $proxyStatus;
@@ -389,52 +377,51 @@ class Proxy extends \OC_FileProxy
* @param $size
* @return bool
*/
- public function postFileSize($path, $size)
- {
+ public function postFileSize( $path, $size ) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC_FilesystemView( '/' );
// if path is a folder do nothing
- if ($view->is_dir($path)) {
+ if ( $view->is_dir( $path ) ) {
return $size;
}
// Reformat path for use with OC_FSV
- $path_split = explode('/', $path);
- $path_f = implode('/', array_slice($path_split, 3));
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
// if path is empty we cannot resolve anything
- if (empty($path_f)) {
+ if ( empty( $path_f ) ) {
return $size;
}
$fileInfo = false;
// get file info from database/cache if not .part file
- if(!Keymanager::isPartialFilePath($path)) {
- $fileInfo = $view->getFileInfo($path);
+ if ( !Keymanager::isPartialFilePath( $path ) ) {
+ $fileInfo = $view->getFileInfo( $path );
}
// if file is encrypted return real file size
- if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+ if ( is_array( $fileInfo ) && $fileInfo['encrypted'] === true ) {
$size = $fileInfo['unencrypted_size'];
} else {
// self healing if file was removed from file cache
- if (!is_array($fileInfo)) {
+ if ( !is_array( $fileInfo ) ) {
$fileInfo = array();
}
$userId = \OCP\User::getUser();
- $util = new Util($view, $userId);
- $fixSize = $util->getFileSize($path);
- if ($fixSize > 0) {
+ $util = new Util( $view, $userId );
+ $fixSize = $util->getFileSize( $path );
+ if ( $fixSize > 0 ) {
$size = $fixSize;
$fileInfo['encrypted'] = true;
$fileInfo['unencrypted_size'] = $size;
// put file info if not .part file
- if(!Keymanager::isPartialFilePath($path_f)) {
- $view->putFileInfo($path, $fileInfo);
+ if ( !Keymanager::isPartialFilePath( $path_f ) ) {
+ $view->putFileInfo( $path, $fileInfo );
}
}
@@ -445,33 +432,32 @@ class Proxy extends \OC_FileProxy
/**
* @param $path
*/
- public function handleFile($path)
- {
+ public function handleFile( $path ) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $view = new \OC_FilesystemView('/');
- $session = new Session($view);
+ $view = new \OC_FilesystemView( '/' );
+ $session = new Session( $view );
$userId = \OCP\User::getUser();
- $util = new Util($view, $userId);
+ $util = new Util( $view, $userId );
// Reformat path for use with OC_FSV
- $path_split = explode('/', $path);
- $path_f = implode('/', array_slice($path_split, 3));
+ $path_split = explode( '/', $path );
+ $path_f = implode( '/', array_slice( $path_split, 3 ) );
// only if file is on 'files' folder fix file size and sharing
- if ($path_split[2] == 'files' && $util->fixFileSize($path)) {
+ if ( count($path_split) >= 2 && $path_split[2] == 'files' && $util->fixFileSize( $path ) ) {
// get sharing app state
$sharingEnabled = \OCP\Share::isEnabled();
// get users
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $path_f);
+ $usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path_f );
// update sharing-keys
- $util->setSharedFileKeyfiles($session, $usersSharing, $path_f);
+ $util->setSharedFileKeyfiles( $session, $usersSharing, $path_f );
}
\OC_FileProxy::$enabled = $proxyStatus;
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 86f56e5676..2ddad0a15d 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -37,27 +37,26 @@ class Session
*
* @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
*/
- public function __construct($view)
- {
+ public function __construct( $view ) {
$this->view = $view;
- if (!$this->view->is_dir('owncloud_private_key')) {
+ if ( !$this->view->is_dir( 'owncloud_private_key' ) ) {
- $this->view->mkdir('owncloud_private_key');
+ $this->view->mkdir( 'owncloud_private_key' );
}
- $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+ $publicShareKeyId = \OC_Appconfig::getValue( 'files_encryption', 'publicShareKeyId' );
- if ($publicShareKeyId === null) {
- $publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
- \OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
+ if ( $publicShareKeyId === null ) {
+ $publicShareKeyId = 'pubShare_' . substr( md5( time() ), 0, 8 );
+ \OC_Appconfig::setValue( 'files_encryption', 'publicShareKeyId', $publicShareKeyId );
}
if (
- !$this->view->file_exists("/public-keys/" . $publicShareKeyId . ".public.key")
- || !$this->view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".private.key")
+ !$this->view->file_exists( "/public-keys/" . $publicShareKeyId . ".public.key" )
+ || !$this->view->file_exists( "/owncloud_private_key/" . $publicShareKeyId . ".private.key" )
) {
$keypair = Crypt::createKeypair();
@@ -68,32 +67,33 @@ class Session
// Save public key
- if (!$view->is_dir('/public-keys')) {
- $view->mkdir('/public-keys');
+ if ( !$view->is_dir( '/public-keys' ) ) {
+ $view->mkdir( '/public-keys' );
}
- $this->view->file_put_contents('/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey']);
+ $this->view->file_put_contents( '/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey'] );
- // Encrypt private key empthy passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '');
+ // Encrypt private key empty passphrase
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
// Save private key
- $this->view->file_put_contents('/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey);
+ $this->view->file_put_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey );
\OC_FileProxy::$enabled = $proxyStatus;
}
- if (\OCP\USER::getUser() === false ||
- (isset($_GET['service']) && $_GET['service'] == 'files' &&
- isset($_GET['t']))) {
+ if ( \OCP\USER::getUser() === false ||
+ ( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
+ isset( $_GET['t'] ) )
+ ) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $encryptedKey = $this->view->file_get_contents('/owncloud_private_key/' . $publicShareKeyId . '.private.key');
- $privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, '');
- $this->setPrivateKey($privateKey);
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
+ $this->setPrivateKey( $privateKey );
\OC_FileProxy::$enabled = $proxyStatus;
}
@@ -104,8 +104,7 @@ class Session
* @param string $privateKey
* @return bool
*/
- public function setPrivateKey($privateKey)
- {
+ public function setPrivateKey( $privateKey ) {
$_SESSION['privateKey'] = $privateKey;
@@ -118,12 +117,11 @@ class Session
* @returns string $privateKey The user's plaintext private key
*
*/
- public function getPrivateKey()
- {
+ public function getPrivateKey() {
if (
- isset($_SESSION['privateKey'])
- && !empty($_SESSION['privateKey'])
+ isset( $_SESSION['privateKey'] )
+ && !empty( $_SESSION['privateKey'] )
) {
return $_SESSION['privateKey'];
@@ -141,8 +139,7 @@ class Session
* @param $legacyKey
* @return bool
*/
- public function setLegacyKey($legacyKey)
- {
+ public function setLegacyKey( $legacyKey ) {
$_SESSION['legacyKey'] = $legacyKey;
@@ -154,12 +151,11 @@ class Session
* @returns string $legacyKey The user's plaintext legacy key
*
*/
- public function getLegacyKey()
- {
+ public function getLegacyKey() {
if (
- isset($_SESSION['legacyKey'])
- && !empty($_SESSION['legacyKey'])
+ isset( $_SESSION['legacyKey'] )
+ && !empty( $_SESSION['legacyKey'] )
) {
return $_SESSION['legacyKey'];
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index b143b62827..fa9df02f08 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -77,19 +77,18 @@ class Stream
* @param $opened_path
* @return bool
*/
- public function stream_open($path, $mode, $options, &$opened_path)
- {
+ public function stream_open( $path, $mode, $options, &$opened_path ) {
- if (!isset($this->rootView)) {
- $this->rootView = new \OC_FilesystemView('/');
+ if ( !isset( $this->rootView ) ) {
+ $this->rootView = new \OC_FilesystemView( '/' );
}
- $util = new Util($this->rootView, \OCP\USER::getUser());
+ $util = new Util( $this->rootView, \OCP\USER::getUser() );
$this->userId = $util->getUserId();
// Strip identifier text from path, this gives us the path relative to data/<user>/files
- $this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
+ $this->relPath = \OC\Files\Filesystem::normalizePath( str_replace( 'crypt://', '', $path ) );
// rawPath is relative to the data directory
$this->rawPath = $util->getUserFilesDir() . $this->relPath;
@@ -111,26 +110,25 @@ class Stream
} else {
- $this->size = $this->rootView->filesize($this->rawPath, $mode);
+ $this->size = $this->rootView->filesize( $this->rawPath, $mode );
}
- $this->handle = $this->rootView->fopen($this->rawPath, $mode);
+ $this->handle = $this->rootView->fopen( $this->rawPath, $mode );
\OC_FileProxy::$enabled = $proxyStatus;
- if (!is_resource($this->handle)) {
+ if ( !is_resource( $this->handle ) ) {
- \OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
+ \OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR );
} else {
- $this->meta = stream_get_meta_data($this->handle);
+ $this->meta = stream_get_meta_data( $this->handle );
}
-
- return is_resource($this->handle);
+ return is_resource( $this->handle );
}
@@ -138,12 +136,11 @@ class Stream
* @param $offset
* @param int $whence
*/
- public function stream_seek($offset, $whence = SEEK_SET)
- {
+ public function stream_seek( $offset, $whence = SEEK_SET ) {
$this->flush();
- fseek($this->handle, $offset, $whence);
+ fseek( $this->handle, $offset, $whence );
}
@@ -152,37 +149,36 @@ class Stream
* @return bool|string
* @throws \Exception
*/
- public function stream_read($count)
- {
+ public function stream_read( $count ) {
$this->writeCache = '';
- if ($count != 8192) {
+ if ( $count != 8192 ) {
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
- \OCP\Util::writeLog('files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
+ \OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
die();
}
// Get the data from the file handle
- $data = fread($this->handle, 8192);
+ $data = fread( $this->handle, 8192 );
$result = '';
- if (strlen($data)) {
+ if ( strlen( $data ) ) {
- if (!$this->getKey()) {
+ if ( !$this->getKey() ) {
// Error! We don't have a key to decrypt the file with
- throw new \Exception('Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
+ throw new \Exception( 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream' );
}
// Decrypt data
- $result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
+ $result = Crypt::symmetricDecryptFileContent( $data, $this->plainKey );
}
@@ -196,11 +192,10 @@ class Stream
* @param string $key key to use for encryption
* @return string encrypted data on success, false on failure
*/
- public function preWriteEncrypt($plainData, $key)
- {
+ public function preWriteEncrypt( $plainData, $key ) {
// Encrypt data to 'catfile', which includes IV
- if ($encrypted = Crypt::symmetricEncryptFileContent($plainData, $key)) {
+ if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
return $encrypted;
@@ -217,11 +212,10 @@ class Stream
* @internal param bool $generate if true, a new key will be generated if none can be found
* @return bool true on key found and set, false on key not found and new key generated and set
*/
- public function getKey()
- {
+ public function getKey() {
// Check if key is already set
- if (isset($this->plainKey) && isset($this->encKeyfile)) {
+ if ( isset( $this->plainKey ) && isset( $this->encKeyfile ) ) {
return true;
@@ -229,18 +223,18 @@ class Stream
// Fetch and decrypt keyfile
// Fetch existing keyfile
- $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->userId, $this->relPath);
+ $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
// If a keyfile already exists
- if ($this->encKeyfile) {
+ if ( $this->encKeyfile ) {
- $session = new Session($this->rootView);
+ $session = new Session( $this->rootView );
- $privateKey = $session->getPrivateKey($this->userId);
+ $privateKey = $session->getPrivateKey( $this->userId );
- $shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+ $shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
- $this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $privateKey);
+ $this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
return true;
@@ -261,8 +255,7 @@ class Stream
* @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
* @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
*/
- public function stream_write($data)
- {
+ public function stream_write( $data ) {
// Disable the file proxies so that encryption is not
// automatically attempted when the file is written to disk -
@@ -272,16 +265,16 @@ class Stream
\OC_FileProxy::$enabled = false;
// Get the length of the unencrypted data that we are handling
- $length = strlen($data);
+ $length = strlen( $data );
// Find out where we are up to in the writing of data to the
// file
- $pointer = ftell($this->handle);
+ $pointer = ftell( $this->handle );
// Get / generate the keyfile for the file we're handling
// If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
- if (!$this->getKey()) {
+ if ( !$this->getKey() ) {
$this->plainKey = Crypt::generateKey();
@@ -289,27 +282,27 @@ class Stream
// If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
- if ($this->writeCache) {
+ if ( $this->writeCache ) {
// Concat writeCache to start of $data
$data = $this->writeCache . $data;
- // Clear the write cache, ready for resuse - it has been
+ // Clear the write cache, ready for reuse - it has been
// flushed and its old contents processed
$this->writeCache = '';
}
- // While there still remains somed data to be processed & written
- while (strlen($data) > 0) {
+ // While there still remains some data to be processed & written
+ while ( strlen( $data ) > 0 ) {
- // Remaining length for this iteration, not of the
+ // Remaining length for this iteration, not of the
// entire file (may be greater than 8192 bytes)
- $remainingLength = strlen($data);
+ $remainingLength = strlen( $data );
- // If data remaining to be written is less than the
+ // If data remaining to be written is less than the
// size of 1 6126 byte block
- if ($remainingLength < 6126) {
+ if ( $remainingLength < 6126 ) {
// Set writeCache to contents of $data
// The writeCache will be carried over to the
@@ -327,25 +320,25 @@ class Stream
} else {
// Read the chunk from the start of $data
- $chunk = substr($data, 0, 6126);
+ $chunk = substr( $data, 0, 6126 );
- $encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
+ $encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
// Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
- fwrite($this->handle, $encrypted);
+ fwrite( $this->handle, $encrypted );
// Remove the chunk we just processed from
// $data, leaving only unprocessed data in $data
// var, for handling on the next round
- $data = substr($data, 6126);
+ $data = substr( $data, 6126 );
}
}
- $this->size = max($this->size, $pointer + $length);
+ $this->size = max( $this->size, $pointer + $length );
$this->unencryptedSize += $length;
\OC_FileProxy::$enabled = $proxyStatus;
@@ -360,18 +353,17 @@ class Stream
* @param $arg1
* @param $arg2
*/
- public function stream_set_option($option, $arg1, $arg2)
- {
+ public function stream_set_option( $option, $arg1, $arg2 ) {
$return = false;
- switch ($option) {
+ switch ( $option ) {
case STREAM_OPTION_BLOCKING:
- $return = stream_set_blocking($this->handle, $arg1);
+ $return = stream_set_blocking( $this->handle, $arg1 );
break;
case STREAM_OPTION_READ_TIMEOUT:
- $return = stream_set_timeout($this->handle, $arg1, $arg2);
+ $return = stream_set_timeout( $this->handle, $arg1, $arg2 );
break;
case STREAM_OPTION_WRITE_BUFFER:
- $return = stream_set_write_buffer($this->handle, $arg1);
+ $return = stream_set_write_buffer( $this->handle, $arg1 );
}
return $return;
@@ -380,26 +372,23 @@ class Stream
/**
* @return array
*/
- public function stream_stat()
- {
- return fstat($this->handle);
+ public function stream_stat() {
+ return fstat( $this->handle );
}
/**
* @param $mode
*/
- public function stream_lock($mode)
- {
- return flock($this->handle, $mode);
+ public function stream_lock( $mode ) {
+ return flock( $this->handle, $mode );
}
/**
* @return bool
*/
- public function stream_flush()
- {
+ public function stream_flush() {
- return fflush($this->handle);
+ return fflush( $this->handle );
// Not a typo: http://php.net/manual/en/function.fflush.php
}
@@ -407,22 +396,20 @@ class Stream
/**
* @return bool
*/
- public function stream_eof()
- {
- return feof($this->handle);
+ public function stream_eof() {
+ return feof( $this->handle );
}
- private function flush()
- {
+ private function flush() {
- if ($this->writeCache) {
+ if ( $this->writeCache ) {
// Set keyfile property for file in question
$this->getKey();
- $encrypted = $this->preWriteEncrypt($this->writeCache, $this->plainKey);
+ $encrypted = $this->preWriteEncrypt( $this->writeCache, $this->plainKey );
- fwrite($this->handle, $encrypted);
+ fwrite( $this->handle, $encrypted );
$this->writeCache = '';
@@ -433,8 +420,7 @@ class Stream
/**
* @return bool
*/
- public function stream_close()
- {
+ public function stream_close() {
$this->flush();
@@ -448,33 +434,33 @@ class Stream
\OC_FileProxy::$enabled = false;
// Fetch user's public key
- $this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
+ $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
// Check if OC sharing api is enabled
$sharingEnabled = \OCP\Share::isEnabled();
- $util = new Util($this->rootView, $this->userId);
+ $util = new Util( $this->rootView, $this->userId );
// Get all users sharing the file includes current user
- $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+ $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId );
// Fetch public keys for all sharing users
- $publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
+ $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
// Encrypt enc key for all sharing users
- $this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
+ $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
- $view = new \OC_FilesystemView('/');
+ $view = new \OC_FilesystemView( '/' );
// Save the new encrypted file key
- Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
+ Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
// Save the sharekeys
- Keymanager::setShareKeys($view, $this->relPath, $this->encKeyfiles['keys']);
+ Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
// get file info
- $fileInfo = $view->getFileInfo($this->rawPath);
- if (!is_array($fileInfo)) {
+ $fileInfo = $view->getFileInfo( $this->rawPath );
+ if ( !is_array( $fileInfo ) ) {
$fileInfo = array();
}
@@ -487,10 +473,10 @@ class Stream
$fileInfo['unencrypted_size'] = $this->unencryptedSize;
// set fileinfo
- $view->putFileInfo($this->rawPath, $fileInfo);
+ $view->putFileInfo( $this->rawPath, $fileInfo );
}
- return fclose($this->handle);
+ return fclose( $this->handle );
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d42fe9953b..2980aa94e0 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -117,25 +117,25 @@ class Util
* @param $userId
* @param bool $client
*/
- public function __construct(\OC_FilesystemView $view, $userId, $client = false)
- {
+ public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
$this->view = $view;
$this->userId = $userId;
$this->client = $client;
$this->isPublic = false;
- $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
- $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+ $this->publicShareKeyId = \OC_Appconfig::getValue( 'files_encryption', 'publicShareKeyId' );
+ $this->recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
// if we are anonymous/public
- if ($this->userId === false ||
- (isset($_GET['service']) && $_GET['service'] == 'files' &&
- isset($_GET['t']))) {
+ if ( $this->userId === false ||
+ ( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
+ isset( $_GET['t'] ) )
+ ) {
$this->userId = $this->publicShareKeyId;
// only handle for files_sharing app
- if ($GLOBALS['app'] === 'files_sharing') {
+ if ( $GLOBALS['app'] === 'files_sharing' ) {
$this->userDir = '/' . $GLOBALS['fileOwner'];
$this->fileFolderName = 'files';
$this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
@@ -164,15 +164,14 @@ class Util
/**
* @return bool
*/
- public function ready()
- {
+ public function ready() {
if (
- !$this->view->file_exists($this->encryptionDir)
- or !$this->view->file_exists($this->keyfilesPath)
- or !$this->view->file_exists($this->shareKeysPath)
- or !$this->view->file_exists($this->publicKeyPath)
- or !$this->view->file_exists($this->privateKeyPath)
+ !$this->view->file_exists( $this->encryptionDir )
+ or !$this->view->file_exists( $this->keyfilesPath )
+ or !$this->view->file_exists( $this->shareKeysPath )
+ or !$this->view->file_exists( $this->publicKeyPath )
+ or !$this->view->file_exists( $this->privateKeyPath )
) {
return false;
@@ -189,8 +188,7 @@ class Util
* @brief Sets up user folders and keys for serverside encryption
* @param string $passphrase passphrase to encrypt server-stored private key with
*/
- public function setupServerSide($passphrase = null)
- {
+ public function setupServerSide( $passphrase = null ) {
// Set directories to check / create
$setUpDirs = array(
@@ -203,11 +201,11 @@ class Util
);
// Check / create all necessary dirs
- foreach ($setUpDirs as $dirPath) {
+ foreach ( $setUpDirs as $dirPath ) {
- if (!$this->view->file_exists($dirPath)) {
+ if ( !$this->view->file_exists( $dirPath ) ) {
- $this->view->mkdir($dirPath);
+ $this->view->mkdir( $dirPath );
}
@@ -216,8 +214,8 @@ class Util
// Create user keypair
// we should never override a keyfile
if (
- !$this->view->file_exists($this->publicKeyPath)
- && !$this->view->file_exists($this->privateKeyPath)
+ !$this->view->file_exists( $this->publicKeyPath )
+ && !$this->view->file_exists( $this->privateKeyPath )
) {
// Generate keypair
@@ -226,35 +224,35 @@ class Util
\OC_FileProxy::$enabled = false;
// Save public key
- $this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+ $this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
// Encrypt private key with user pwd as passphrase
- $encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+ $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
// Save private key
- $this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+ $this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
\OC_FileProxy::$enabled = true;
} else {
// check if public-key exists but private-key is missing
- if($this->view->file_exists($this->publicKeyPath) && !$this->view->file_exists($this->privateKeyPath)) {
- \OC_Log::write('Encryption library', 'public key exists but private key is missing for "' . $this->userId . '"', \OC_Log::FATAL);
+ if ( $this->view->file_exists( $this->publicKeyPath ) && !$this->view->file_exists( $this->privateKeyPath ) ) {
+ \OC_Log::write( 'Encryption library', 'public key exists but private key is missing for "' . $this->userId . '"', \OC_Log::FATAL );
return false;
- } else if(!$this->view->file_exists($this->publicKeyPath) && $this->view->file_exists($this->privateKeyPath)) {
- \OC_Log::write('Encryption library', 'private key exists but public key is missing for "' . $this->userId . '"', \OC_Log::FATAL);
+ } else if ( !$this->view->file_exists( $this->publicKeyPath ) && $this->view->file_exists( $this->privateKeyPath ) ) {
+ \OC_Log::write( 'Encryption library', 'private key exists but public key is missing for "' . $this->userId . '"', \OC_Log::FATAL );
return false;
}
}
// If there's no record for this user's encryption preferences
- if (false === $this->recoveryEnabledForUser()) {
+ if ( false === $this->recoveryEnabledForUser() ) {
// create database configuration
$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
- $args = array($this->userId, 'server-side', 0);
- $query = \OCP\DB::prepare($sql);
- $query->execute($args);
+ $args = array( $this->userId, 'server-side', 0 );
+ $query = \OCP\DB::prepare( $sql );
+ $query->execute( $args );
}
@@ -265,8 +263,7 @@ class Util
/**
* @return string
*/
- public function getPublicShareKeyId()
- {
+ public function getPublicShareKeyId() {
return $this->publicShareKeyId;
}
@@ -277,8 +274,7 @@ class Util
* @note If records are not being returned, check for a hidden space
* at the start of the uid in db
*/
- public function recoveryEnabledForUser()
- {
+ public function recoveryEnabledForUser() {
$sql = 'SELECT
recovery_enabled
@@ -287,22 +283,22 @@ class Util
WHERE
uid = ?';
- $args = array($this->userId);
+ $args = array( $this->userId );
- $query = \OCP\DB::prepare($sql);
+ $query = \OCP\DB::prepare( $sql );
- $result = $query->execute($args);
+ $result = $query->execute( $args );
$recoveryEnabled = array();
- while ($row = $result->fetchRow()) {
+ while ( $row = $result->fetchRow() ) {
$recoveryEnabled[] = $row['recovery_enabled'];
}
// If no record is found
- if (empty($recoveryEnabled)) {
+ if ( empty( $recoveryEnabled ) ) {
return false;
@@ -320,19 +316,18 @@ class Util
* @param bool $enabled Whether to enable or disable recovery
* @return bool
*/
- public function setRecoveryForUser($enabled)
- {
+ public function setRecoveryForUser( $enabled ) {
$recoveryStatus = $this->recoveryEnabledForUser();
// If a record for this user already exists, update it
- if (false === $recoveryStatus) {
+ if ( false === $recoveryStatus ) {
$sql = 'INSERT INTO `*PREFIX*encryption`
(`uid`,`mode`,`recovery_enabled`)
VALUES (?,?,?)';
- $args = array($this->userId, 'server-side', $enabled);
+ $args = array( $this->userId, 'server-side', $enabled );
// Create a new record instead
} else {
@@ -344,13 +339,13 @@ class Util
WHERE
uid = ?';
- $args = array($enabled, $this->userId);
+ $args = array( $enabled, $this->userId );
}
- $query = \OCP\DB::prepare($sql);
+ $query = \OCP\DB::prepare( $sql );
- if ($query->execute($args)) {
+ if ( $query->execute( $args ) ) {
return true;
@@ -369,47 +364,46 @@ class Util
* @note $directory needs to be a path relative to OC data dir. e.g.
* /admin/files NOT /backup OR /home/www/oc/data/admin/files
*/
- public function findEncFiles($directory, &$found = false)
- {
+ public function findEncFiles( $directory, &$found = false ) {
// Disable proxy - we don't want files to be decrypted before
// we handle them
\OC_FileProxy::$enabled = false;
- if($found == false) {
- $found = array('plain' => array(), 'encrypted' => array(), 'legacy' => array());
+ if ( $found == false ) {
+ $found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
}
if (
- $this->view->is_dir($directory)
- && $handle = $this->view->opendir($directory)
+ $this->view->is_dir( $directory )
+ && $handle = $this->view->opendir( $directory )
) {
- while (false !== ($file = readdir($handle))) {
+ while ( false !== ( $file = readdir( $handle ) ) ) {
if (
$file != "."
&& $file != ".."
) {
- $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
- $relPath = $this->stripUserFilesPath($filePath);
+ $filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
+ $relPath = $this->stripUserFilesPath( $filePath );
// If the path is a directory, search
// its contents
- if ($this->view->is_dir($filePath)) {
+ if ( $this->view->is_dir( $filePath ) ) {
- $this->findEncFiles($filePath, $found);
+ $this->findEncFiles( $filePath, $found );
// If the path is a file, determine
// its encryption status
- } elseif ($this->view->is_file($filePath)) {
+ } elseif ( $this->view->is_file( $filePath ) ) {
// Disable proxies again, some-
// where they got re-enabled :/
\OC_FileProxy::$enabled = false;
- $data = $this->view->file_get_contents($filePath);
+ $data = $this->view->file_get_contents( $filePath );
// If the file is encrypted
// NOTE: If the userId is
@@ -419,22 +413,22 @@ class Util
// scanning every file like this
// will eat server resources :(
if (
- Keymanager::getFileKey($this->view, $this->userId, $relPath)
- && Crypt::isCatfileContent($data)
+ Keymanager::getFileKey( $this->view, $this->userId, $relPath )
+ && Crypt::isCatfileContent( $data )
) {
- $found['encrypted'][] = array('name' => $file, 'path' => $filePath);
+ $found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
// If the file uses old
// encryption system
- } elseif (Crypt::isLegacyEncryptedContent($this->tail($filePath, 3), $relPath)) {
+ } elseif ( Crypt::isLegacyEncryptedContent( $this->tail( $filePath, 3 ), $relPath ) ) {
- $found['legacy'][] = array('name' => $file, 'path' => $filePath);
+ $found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
// If the file is not encrypted
} else {
- $found['plain'][] = array('name' => $file, 'path' => $relPath);
+ $found['plain'][] = array( 'name' => $file, 'path' => $relPath );
}
@@ -446,7 +440,7 @@ class Util
\OC_FileProxy::$enabled = true;
- if (empty($found)) {
+ if ( empty( $found ) ) {
return false;
@@ -469,39 +463,38 @@ class Util
* @note Safe to use on large files; does not read entire file to memory
* @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
*/
- public function tail($filename, $numLines)
- {
+ public function tail( $filename, $numLines ) {
\OC_FileProxy::$enabled = false;
$text = '';
$pos = -1;
- $handle = $this->view->fopen($filename, 'r');
+ $handle = $this->view->fopen( $filename, 'r' );
- while ($numLines > 0) {
+ while ( $numLines > 0 ) {
--$pos;
- if (fseek($handle, $pos, SEEK_END) !== 0) {
+ if ( fseek( $handle, $pos, SEEK_END ) !== 0 ) {
- rewind($handle);
+ rewind( $handle );
$numLines = 0;
- } elseif (fgetc($handle) === "\n") {
+ } elseif ( fgetc( $handle ) === "\n" ) {
--$numLines;
}
- $block_size = (-$pos) % 8192;
- if ($block_size === 0 || $numLines === 0) {
+ $block_size = ( -$pos ) % 8192;
+ if ( $block_size === 0 || $numLines === 0 ) {
- $text = fread($handle, ($block_size === 0 ? 8192 : $block_size)) . $text;
+ $text = fread( $handle, ( $block_size === 0 ? 8192 : $block_size ) ) . $text;
}
}
- fclose($handle);
+ fclose( $handle );
\OC_FileProxy::$enabled = true;
@@ -513,8 +506,7 @@ class Util
* @param $path
* @return boolean
*/
- public function isEncryptedPath($path)
- {
+ public function isEncryptedPath( $path ) {
// Disable encryption proxy so data retrieved is in its
// original form
@@ -523,15 +515,15 @@ class Util
// we only need 24 byte from the last chunk
$data = '';
- $handle = $this->view->fopen($path, 'r');
- if (!fseek($handle, -24, SEEK_END)) {
- $data = fgets($handle);
+ $handle = $this->view->fopen( $path, 'r' );
+ if ( !fseek( $handle, -24, SEEK_END ) ) {
+ $data = fgets( $handle );
}
// re-enable proxy
\OC_FileProxy::$enabled = $proxyStatus;
- return Crypt::isCatfileContent($data);
+ return Crypt::isCatfileContent( $data );
}
@@ -540,8 +532,7 @@ class Util
* @param string $path absolute path
* @return bool
*/
- public function getFileSize($path)
- {
+ public function getFileSize( $path ) {
$result = 0;
@@ -550,33 +541,33 @@ class Util
\OC_FileProxy::$enabled = false;
// Reformat path for use with OC_FSV
- $pathSplit = explode('/', $path);
- $pathRelative = implode('/', array_slice($pathSplit, 3));
+ $pathSplit = explode( '/', $path );
+ $pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
- if ($pathSplit[2] == 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
+ if ( $pathSplit[2] == 'files' && $this->view->file_exists( $path ) && $this->isEncryptedPath( $path ) ) {
// get the size from filesystem
- $fullPath = $this->view->getLocalFile($path);
- $size = filesize($fullPath);
+ $fullPath = $this->view->getLocalFile( $path );
+ $size = filesize( $fullPath );
// calculate last chunk nr
- $lastChunckNr = floor($size / 8192);
+ $lastChunkNr = floor( $size / 8192 );
// open stream
- $stream = fopen('crypt://' . $pathRelative, "r");
+ $stream = fopen( 'crypt://' . $pathRelative, "r" );
- if (is_resource($stream)) {
+ if ( is_resource( $stream ) ) {
// calculate last chunk position
- $lastChunckPos = ($lastChunckNr * 8192);
+ $lastChunckPos = ( $lastChunkNr * 8192 );
// seek to end
- fseek($stream, $lastChunckPos);
+ fseek( $stream, $lastChunckPos );
// get the content of the last chunk
- $lastChunkContent = fread($stream, 8192);
+ $lastChunkContent = fread( $stream, 8192 );
// calc the real file size with the size of the last chunk
- $realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
+ $realSize = ( ( $lastChunkNr * 6126 ) + strlen( $lastChunkContent ) );
// store file size
$result = $realSize;
@@ -593,8 +584,7 @@ class Util
* @param $path absolute path
* @return true / false if file is encrypted
*/
- public function fixFileSize($path)
- {
+ public function fixFileSize( $path ) {
$result = false;
@@ -602,18 +592,18 @@ class Util
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $realSize = $this->getFileSize($path);
+ $realSize = $this->getFileSize( $path );
- if ($realSize > 0) {
+ if ( $realSize > 0 ) {
- $cached = $this->view->getFileInfo($path);
+ $cached = $this->view->getFileInfo( $path );
$cached['encrypted'] = true;
// set the size
$cached['unencrypted_size'] = $realSize;
// put file info
- $this->view->putFileInfo($path, $cached);
+ $this->view->putFileInfo( $path, $cached );
$result = true;
@@ -628,13 +618,12 @@ class Util
* @brief Format a path to be relative to the /user/files/ directory
* @note e.g. turns '/admin/files/test.txt' into 'test.txt'
*/
- public function stripUserFilesPath($path)
- {
+ public function stripUserFilesPath( $path ) {
- $trimmed = ltrim($path, '/');
- $split = explode('/', $trimmed);
- $sliced = array_slice($split, 2);
- $relPath = implode('/', $sliced);
+ $trimmed = ltrim( $path, '/' );
+ $split = explode( '/', $trimmed );
+ $sliced = array_slice( $split, 2 );
+ $relPath = implode( '/', $sliced );
return $relPath;
@@ -644,13 +633,12 @@ class Util
* @param $path
* @return bool
*/
- public function isSharedPath($path)
- {
+ public function isSharedPath( $path ) {
- $trimmed = ltrim($path, '/');
- $split = explode('/', $trimmed);
+ $trimmed = ltrim( $path, '/' );
+ $split = explode( '/', $trimmed );
- if ($split[2] == "Shared") {
+ if ( $split[2] == "Shared" ) {
return true;
@@ -670,16 +658,15 @@ class Util
* @return bool
* @note Encryption is recursive
*/
- public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null)
- {
+ public function encryptAll( $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
- if ($found = $this->findEncFiles($dirPath)) {
+ if ( $found = $this->findEncFiles( $dirPath ) ) {
// Disable proxy to prevent file being encrypted twice
\OC_FileProxy::$enabled = false;
// Encrypt unencrypted files
- foreach ($found['plain'] as $plainFile) {
+ foreach ( $found['plain'] as $plainFile ) {
//relative to data/<user>/file
$relPath = $plainFile['path'];
@@ -688,80 +675,80 @@ class Util
$rawPath = $this->userId . '/files/' . $plainFile['path'];
// Open plain file handle for binary reading
- $plainHandle1 = $this->view->fopen($rawPath, 'rb');
+ $plainHandle1 = $this->view->fopen( $rawPath, 'rb' );
// 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
- $plainHandle2 = $this->view->fopen($rawPath . '.plaintmp', 'wb');
+ $plainHandle2 = $this->view->fopen( $rawPath . '.plaintmp', 'wb' );
// Move plain file to a temporary location
- stream_copy_to_stream($plainHandle1, $plainHandle2);
+ stream_copy_to_stream( $plainHandle1, $plainHandle2 );
// Close access to original file
// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
// Delete original plain file so we can rename enc file later
- $this->view->unlink($rawPath);
+ $this->view->unlink( $rawPath );
// Open enc file handle for binary writing, with same filename as original plain file
- $encHandle = fopen('crypt://' . $relPath, 'wb');
+ $encHandle = fopen( 'crypt://' . $relPath, 'wb' );
// Save data from plain stream to new encrypted file via enc stream
// NOTE: Stream{} will be invoked for handling
// the encryption, and should handle all keys
// and their generation etc. automatically
- stream_copy_to_stream($plainHandle2, $encHandle);
+ stream_copy_to_stream( $plainHandle2, $encHandle );
// get file size
- $size = $this->view->filesize($rawPath . '.plaintmp');
+ $size = $this->view->filesize( $rawPath . '.plaintmp' );
// Delete temporary plain copy of file
- $this->view->unlink($rawPath . '.plaintmp');
+ $this->view->unlink( $rawPath . '.plaintmp' );
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo($plainFile['path'], array('encrypted' => true, 'size' => $size, 'unencrypted_size' => $size));
+ \OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
}
// Encrypt legacy encrypted files
if (
- !empty($legacyPassphrase)
- && !empty($newPassphrase)
+ !empty( $legacyPassphrase )
+ && !empty( $newPassphrase )
) {
- foreach ($found['legacy'] as $legacyFile) {
+ foreach ( $found['legacy'] as $legacyFile ) {
// Fetch data from file
- $legacyData = $this->view->file_get_contents($legacyFile['path']);
+ $legacyData = $this->view->file_get_contents( $legacyFile['path'] );
$sharingEnabled = \OCP\Share::isEnabled();
// if file exists try to get sharing users
- if ($this->view->file_exists($legacyFile['path'])) {
- $uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
+ if ( $this->view->file_exists( $legacyFile['path'] ) ) {
+ $uniqueUserIds = $this->getSharingUsersArray( $sharingEnabled, $legacyFile['path'], $this->userId );
} else {
$uniqueUserIds[] = $this->userId;
}
// Fetch public keys for all users who will share the file
- $publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
+ $publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds );
// Recrypt data, generate catfile
- $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path']);
+ $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path'] );
$rawPath = $legacyFile['path'];
- $relPath = $this->stripUserFilesPath($rawPath);
+ $relPath = $this->stripUserFilesPath( $rawPath );
// Save keyfile
- Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
+ Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
// Save sharekeys to user folders
- Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
+ Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
// Overwrite the existing file with the encrypted one
- $this->view->file_put_contents($rawPath, $recrypted['data']);
+ $this->view->file_put_contents( $rawPath, $recrypted['data'] );
- $size = strlen($recrypted['data']);
+ $size = strlen( $recrypted['data'] );
// Add the file to the cache
- \OC\Files\Filesystem::putFileInfo($rawPath, array('encrypted' => true, 'size' => $size), '');
+ \OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted' => true, 'size' => $size ), '' );
}
}
@@ -781,10 +768,9 @@ class Util
* @param string $pathName Name of the directory to return the path of
* @return string path
*/
- public function getPath($pathName)
- {
+ public function getPath( $pathName ) {
- switch ($pathName) {
+ switch ( $pathName ) {
case 'publicKeyDir':
@@ -815,9 +801,10 @@ class Util
return $this->privateKeyPath;
break;
-
}
+ return false;
+
}
/**
@@ -825,18 +812,17 @@ class Util
* @param int $fileId id of the file
* @return string path of the file
*/
- public static function fileIdToPath($fileId)
- {
+ public static function fileIdToPath( $fileId ) {
- $query = \OC_DB::prepare('SELECT `path`'
+ $query = \OC_DB::prepare( 'SELECT `path`'
. ' FROM `*PREFIX*filecache`'
- . ' WHERE `fileid` = ?');
+ . ' WHERE `fileid` = ?' );
- $result = $query->execute(array($fileId));
+ $result = $query->execute( array( $fileId ) );
$row = $result->fetchRow();
- return substr($row['path'], 5);
+ return substr( $row['path'], 5 );
}
@@ -845,16 +831,15 @@ class Util
* @param array $unfilteredUsers users to be checked for sharing readiness
* @return multi-dimensional array. keys: ready, unready
*/
- public function filterShareReadyUsers($unfilteredUsers)
- {
+ public function filterShareReadyUsers( $unfilteredUsers ) {
// This array will collect the filtered IDs
$readyIds = $unreadyIds = array();
// Loop through users and create array of UIDs that need new keyfiles
- foreach ($unfilteredUsers as $user) {
+ foreach ( $unfilteredUsers as $user ) {
- $util = new Util($this->view, $user);
+ $util = new Util( $this->view, $user );
// Check that the user is encryption capable, or is the
// public system user 'ownCloud' (for public shares)
@@ -874,15 +859,15 @@ class Util
// Log warning; we can't do necessary setup here
// because we don't have the user passphrase
- \OC_Log::write('Encryption library', '"' . $user . '" is not setup for encryption', \OC_Log::WARN);
+ \OC_Log::write( 'Encryption library', '"' . $user . '" is not setup for encryption', \OC_Log::WARN );
}
}
return array(
- 'ready' => $readyIds
- , 'unready' => $unreadyIds
+ 'ready' => $readyIds,
+ 'unready' => $unreadyIds
);
}
@@ -897,32 +882,31 @@ class Util
* @note This was used when 2 types of encryption for keyfiles was used,
* but now we've switched to exclusively using openssl_seal()
*/
- public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey)
- {
+ public function decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey ) {
// Get the encrypted keyfile
// NOTE: the keyfile format depends on how it was encrypted! At
// this stage we don't know how it was encrypted
- $encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
+ $encKeyfile = Keymanager::getFileKey( $this->view, $this->userId, $filePath );
// We need to decrypt the keyfile
// Has the file been shared yet?
if (
$this->userId == $fileOwner
- && !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+ && !Keymanager::getShareKey( $this->view, $this->userId, $filePath ) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
) {
// The file has no shareKey, and its keyfile must be
// decrypted conventionally
- $plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
+ $plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
} else {
// The file has a shareKey and must use it for decryption
- $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
+ $shareKey = Keymanager::getShareKey( $this->view, $this->userId, $filePath );
- $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
}
@@ -937,23 +921,22 @@ class Util
* @param string $filePath path of the file to be shared
* @return bool
*/
- public function setSharedFileKeyfiles(Session $session, array $users, $filePath)
- {
+ public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
// Make sure users are capable of sharing
- $filteredUids = $this->filterShareReadyUsers($users);
+ $filteredUids = $this->filterShareReadyUsers( $users );
// If we're attempting to share to unready users
- if (!empty($filteredUids['unready'])) {
+ if ( !empty( $filteredUids['unready'] ) ) {
- \OC_Log::write('Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"' . print_r($filteredUids['unready'], 1), \OC_Log::WARN);
+ \OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"' . print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
return false;
}
// Get public keys for each user, ready for generating sharekeys
- $userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
// Note proxy status then disable it
$proxyStatus = \OC_FileProxy::$enabled;
@@ -962,22 +945,22 @@ class Util
// Get the current users's private key for decrypting existing keyfile
$privateKey = $session->getPrivateKey();
- $fileOwner = \OC\Files\Filesystem::getOwner($filePath);
+ $fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
// Decrypt keyfile
- $plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
+ $plainKeyfile = $this->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
// Re-enc keyfile to (additional) sharekeys
- $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+ $multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
// Save the recrypted key to it's owner's keyfiles directory
// Save new sharekeys to all necessary user directory
if (
- !Keymanager::setFileKey($this->view, $filePath, $fileOwner, $multiEncKey['data'])
- || !Keymanager::setShareKeys($this->view, $filePath, $multiEncKey['keys'])
+ !Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
+ || !Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
) {
- \OC_Log::write('Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR);
+ \OC_Log::write( 'Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR );
return false;
@@ -993,12 +976,11 @@ class Util
* @brief Find, sanitise and format users sharing a file
* @note This wraps other methods into a portable bundle
*/
- public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false)
- {
+ public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
// Check if key recovery is enabled
if (
- \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
+ \OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' )
&& $this->recoveryEnabledForUser()
) {
@@ -1011,14 +993,15 @@ class Util
}
// Make sure that a share key is generated for the owner too
- list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+ list( $owner, $ownerPath ) = $this->getUidAndFilename( $filePath );
- if ($sharingEnabled) {
+ $userIds = array();
+ if ( $sharingEnabled ) {
// Find out who, if anyone, is sharing the file
- $result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true, true, true);
+ $result = \OCP\Share::getUsersSharingFile( $ownerPath, $owner, true, true, true );
$userIds = $result['users'];
- if ($result['public']) {
+ if ( $result['public'] ) {
$userIds[] = $this->publicShareKeyId;
}
@@ -1026,10 +1009,10 @@ class Util
// If recovery is enabled, add the
// Admin UID to list of users to share to
- if ($recoveryEnabled) {
+ if ( $recoveryEnabled ) {
// Find recoveryAdmin user ID
- $recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+ $recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
// Add recoveryAdmin to list of users sharing
$userIds[] = $recoveryKeyId;
@@ -1037,14 +1020,14 @@ class Util
}
// add current user if given
- if ($currentUserId != false) {
+ if ( $currentUserId != false ) {
$userIds[] = $currentUserId;
}
// Remove duplicate UIDs
- $uniqueUserIds = array_unique($userIds);
+ $uniqueUserIds = array_unique( $userIds );
return $uniqueUserIds;
@@ -1055,8 +1038,7 @@ class Util
* @param $status
* @return bool
*/
- public function setMigrationStatus($status)
- {
+ public function setMigrationStatus( $status ) {
$sql = 'UPDATE
*PREFIX*encryption
@@ -1065,11 +1047,11 @@ class Util
WHERE
uid = ?';
- $args = array($status, $this->userId);
+ $args = array( $status, $this->userId );
- $query = \OCP\DB::prepare($sql);
+ $query = \OCP\DB::prepare( $sql );
- if ($query->execute($args)) {
+ if ( $query->execute( $args ) ) {
return true;
@@ -1087,8 +1069,7 @@ class Util
* @note If records are not being returned, check for a hidden space
* at the start of the uid in db
*/
- public function getMigrationStatus()
- {
+ public function getMigrationStatus() {
$sql = 'SELECT
migration_status
@@ -1097,22 +1078,21 @@ class Util
WHERE
uid = ?';
- $args = array($this->userId);
+ $args = array( $this->userId );
- $query = \OCP\DB::prepare($sql);
+ $query = \OCP\DB::prepare( $sql );
- $result = $query->execute($args);
+ $result = $query->execute( $args );
$migrationStatus = array();
- while ($row = $result->fetchRow()) {
-
+ $row = $result->fetchRow();
+ if($row) {
$migrationStatus[] = $row['migration_status'];
-
}
// If no record is found
- if (empty($migrationStatus)) {
+ if ( empty( $migrationStatus ) ) {
return false;
@@ -1132,83 +1112,74 @@ class Util
* relative to /Shared are also acceptable
* @return array
*/
- public function getUidAndFilename($path)
- {
+ public function getUidAndFilename( $path ) {
- $view = new \OC\Files\View($this->userFilesDir);
- $fileOwnerUid = $view->getOwner($path);
+ $view = new \OC\Files\View( $this->userFilesDir );
+ $fileOwnerUid = $view->getOwner( $path );
// handle public access
- if ($this->isPublic) {
+ if ( $this->isPublic ) {
$filename = $path;
$fileOwnerUid = $GLOBALS['fileOwner'];
- return array($fileOwnerUid, $filename);
+ return array( $fileOwnerUid, $filename );
} else {
// Check that UID is valid
- if (!\OCP\User::userExists($fileOwnerUid)) {
- throw new \Exception('Could not find owner (UID = "' . var_export($fileOwnerUid, 1) . '") of file "' . $path . '"');
+ if ( !\OCP\User::userExists( $fileOwnerUid ) ) {
+ throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
}
// NOTE: Bah, this dependency should be elsewhere
- \OC\Files\Filesystem::initMountPoints($fileOwnerUid);
+ \OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
// If the file owner is the currently logged in user
- if ($fileOwnerUid == $this->userId) {
+ if ( $fileOwnerUid == $this->userId ) {
// Assume the path supplied is correct
$filename = $path;
} else {
- $info = $view->getFileInfo($path);
- $ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
+ $info = $view->getFileInfo( $path );
+ $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
// Fetch real file path from DB
- $filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
+ $filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
}
- return array($fileOwnerUid, $filename);
+ return array( $fileOwnerUid, $filename );
}
}
/**
- * @brief geo recursively through a dir and collect all files and sub files.
+ * @brief go recursively through a dir and collect all files and sub files.
* @param string $dir relative to the users files folder
* @return array with list of files relative to the users files folder
*/
- public function getAllFiles($dir)
- {
+ public function getAllFiles( $dir ) {
$result = array();
- $content = $this->view->getDirectoryContent($this->userFilesDir . $dir);
+ $content = $this->view->getDirectoryContent( $this->userFilesDir . $dir );
// handling for re shared folders
- $path_split = explode('/', $dir);
- $shared = '';
-
- if ($path_split[1] === 'Shared') {
-
- $shared = '/Shared';
+ $path_split = explode( '/', $dir );
- }
-
- foreach ($content as $c) {
+ foreach ( $content as $c ) {
- $sharedPart = $path_split[sizeof($path_split) - 1];
- $targetPathSplit = array_reverse(explode('/', $c['path']));
+ $sharedPart = $path_split[sizeof( $path_split ) - 1];
+ $targetPathSplit = array_reverse( explode( '/', $c['path'] ) );
$path = '';
// rebuild path
- foreach ($targetPathSplit as $pathPart) {
+ foreach ( $targetPathSplit as $pathPart ) {
- if ($pathPart !== $sharedPart) {
+ if ( $pathPart !== $sharedPart ) {
$path = '/' . $pathPart . $path;
@@ -1222,9 +1193,9 @@ class Util
$path = $dir . $path;
- if ($c['type'] === "dir") {
+ if ( $c['type'] === "dir" ) {
- $result = array_merge($result, $this->getAllFiles($path));
+ $result = array_merge( $result, $this->getAllFiles( $path ) );
} else {
@@ -1242,14 +1213,13 @@ class Util
* @param int $id of the current share
* @return array of the parent
*/
- public static function getShareParent($id)
- {
+ public static function getShareParent( $id ) {
- $query = \OC_DB::prepare('SELECT `file_target`, `item_type`'
+ $query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
. ' FROM `*PREFIX*share`'
- . ' WHERE `id` = ?');
+ . ' WHERE `id` = ?' );
- $result = $query->execute(array($id));
+ $result = $query->execute( array( $id ) );
$row = $result->fetchRow();
@@ -1262,14 +1232,13 @@ class Util
* @param int $id of the current share
* @return array of the parent
*/
- public static function getParentFromShare($id)
- {
+ public static function getParentFromShare( $id ) {
- $query = \OC_DB::prepare('SELECT `parent`'
+ $query = \OC_DB::prepare( 'SELECT `parent`'
. ' FROM `*PREFIX*share`'
- . ' WHERE `id` = ?');
+ . ' WHERE `id` = ?' );
- $result = $query->execute(array($id));
+ $result = $query->execute( array( $id ) );
$row = $result->fetchRow();
@@ -1283,22 +1252,23 @@ class Util
* @internal param int $Id of a share
* @return string owner
*/
- public function getOwnerFromSharedFile($id)
- {
+ public function getOwnerFromSharedFile( $id ) {
+
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $source = $query->execute( array( $id ) )->fetchRow();
- $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $source = $query->execute(array($id))->fetchRow();
+ $fileOwner = false;
- if (isset($source['parent'])) {
+ if ( isset( $source['parent'] ) ) {
$parent = $source['parent'];
- while (isset($parent)) {
+ while ( isset( $parent ) ) {
- $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $item = $query->execute(array($parent))->fetchRow();
+ $query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
+ $item = $query->execute( array( $parent ) )->fetchRow();
- if (isset($item['parent'])) {
+ if ( isset( $item['parent'] ) ) {
$parent = $item['parent'];
@@ -1324,16 +1294,14 @@ class Util
/**
* @return string
*/
- public function getUserId()
- {
+ public function getUserId() {
return $this->userId;
}
/**
* @return string
*/
- public function getUserFilesDir()
- {
+ public function getUserFilesDir() {
return $this->userFilesDir;
}
@@ -1341,8 +1309,7 @@ class Util
* @param $password
* @return bool
*/
- public function checkRecoveryPassword($password)
- {
+ public function checkRecoveryPassword( $password ) {
$pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
$pathControlData = '/control-file/controlfile.enc';
@@ -1350,16 +1317,16 @@ class Util
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $recoveryKey = $this->view->file_get_contents($pathKey);
+ $recoveryKey = $this->view->file_get_contents( $pathKey );
- $decryptedRecoveryKey = Crypt::symmetricDecryptFileContent($recoveryKey, $password);
+ $decryptedRecoveryKey = Crypt::symmetricDecryptFileContent( $recoveryKey, $password );
- $controlData = $this->view->file_get_contents($pathControlData);
- $decryptedControlData = Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
+ $controlData = $this->view->file_get_contents( $pathControlData );
+ $decryptedControlData = Crypt::keyDecrypt( $controlData, $decryptedRecoveryKey );
\OC_FileProxy::$enabled = $proxyStatus;
- if ($decryptedControlData === 'ownCloud') {
+ if ( $decryptedControlData === 'ownCloud' ) {
return true;
}
@@ -1369,27 +1336,26 @@ class Util
/**
* @return string
*/
- public function getRecoveryKeyId()
- {
+ public function getRecoveryKeyId() {
return $this->recoveryKeyId;
}
/**
* @brief add recovery key to all encrypted files
*/
- public function addRecoveryKeys($path = '/')
- {
- $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
- foreach ($dirContent as $item) {
- $filePath = substr($item['path'], 25);
- if ($item['type'] == 'dir') {
- $this->addRecoveryKeys($filePath . '/');
+ public function addRecoveryKeys( $path = '/' ) {
+ $dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
+ foreach ( $dirContent as $item ) {
+ // get relative path from files_encryption/keyfiles/
+ $filePath = substr( $item['path'], strlen('files_encryption/keyfiles') );
+ if ( $item['type'] == 'dir' ) {
+ $this->addRecoveryKeys( $filePath . '/' );
} else {
- $session = new Session(new \OC_FilesystemView('/'));
+ $session = new Session( new \OC_FilesystemView( '/' ) );
$sharingEnabled = \OCP\Share::isEnabled();
- $file = substr($filePath, 0, -4);
- $usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
- $this->setSharedFileKeyfiles($session, $usersSharing, $file);
+ $file = substr( $filePath, 0, -4 );
+ $usersSharing = $this->getSharingUsersArray( $sharingEnabled, $file );
+ $this->setSharedFileKeyfiles( $session, $usersSharing, $file );
}
}
}
@@ -1397,16 +1363,16 @@ class Util
/**
* @brief remove recovery key to all encrypted files
*/
- public function removeRecoveryKeys($path = '/')
- {
- $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
- foreach ($dirContent as $item) {
- $filePath = substr($item['path'], 25);
- if ($item['type'] == 'dir') {
- $this->removeRecoveryKeys($filePath . '/');
+ public function removeRecoveryKeys( $path = '/' ) {
+ $dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
+ foreach ( $dirContent as $item ) {
+ // get relative path from files_encryption/keyfiles
+ $filePath = substr( $item['path'], strlen('files_encryption/keyfiles') );
+ if ( $item['type'] == 'dir' ) {
+ $this->removeRecoveryKeys( $filePath . '/' );
} else {
- $file = substr($filePath, 0, -4);
- $this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
+ $file = substr( $filePath, 0, -4 );
+ $this->view->unlink( $this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey' );
}
}
}
@@ -1416,40 +1382,39 @@ class Util
* @param string $file
* @param string $privateKey recovery key to decrypt the file
*/
- private function recoverFile($file, $privateKey)
- {
+ private function recoverFile( $file, $privateKey ) {
$sharingEnabled = \OCP\Share::isEnabled();
// Find out who, if anyone, is sharing the file
- if ($sharingEnabled) {
- $result = \OCP\Share::getUsersSharingFile($file, $this->userId, true, true, true);
+ if ( $sharingEnabled ) {
+ $result = \OCP\Share::getUsersSharingFile( $file, $this->userId, true, true, true );
$userIds = $result['users'];
$userIds[] = $this->recoveryKeyId;
- if ($result['public']) {
+ if ( $result['public'] ) {
$userIds[] = $this->publicShareKeyId;
}
} else {
- $userIds = array($this->userId, $this->recoveryKeyId);
+ $userIds = array( $this->userId, $this->recoveryKeyId );
}
- $filteredUids = $this->filterShareReadyUsers($userIds);
+ $filteredUids = $this->filterShareReadyUsers( $userIds );
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
//decrypt file key
- $encKeyfile = $this->view->file_get_contents($this->keyfilesPath . $file . ".key");
- $shareKey = $this->view->file_get_contents($this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey");
- $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+ $encKeyfile = $this->view->file_get_contents( $this->keyfilesPath . $file . ".key" );
+ $shareKey = $this->view->file_get_contents( $this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey" );
+ $plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
// encrypt file key again to all users, this time with the new public key for the recovered use
- $userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
- $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+ $userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
+ $multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
// write new keys to filesystem TDOO!
- $this->view->file_put_contents($this->keyfilesPath . $file . '.key', $multiEncKey['data']);
- foreach ($multiEncKey['keys'] as $userId => $shareKey) {
+ $this->view->file_put_contents( $this->keyfilesPath . $file . '.key', $multiEncKey['data'] );
+ foreach ( $multiEncKey['keys'] as $userId => $shareKey ) {
$shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
- $this->view->file_put_contents($shareKeyPath, $shareKey);
+ $this->view->file_put_contents( $shareKeyPath, $shareKey );
}
// Return proxy to original status
@@ -1461,16 +1426,15 @@ class Util
* @param string $path to look for files keys
* @param string $privateKey private recovery key which is used to decrypt the files
*/
- private function recoverAllFiles($path, $privateKey)
- {
- $dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
- foreach ($dirContent as $item) {
- $filePath = substr($item['path'], 25);
- if ($item['type'] == 'dir') {
- $this->recoverAllFiles($filePath . '/', $privateKey);
+ private function recoverAllFiles( $path, $privateKey ) {
+ $dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
+ foreach ( $dirContent as $item ) {
+ $filePath = substr( $item['path'], 25 );
+ if ( $item['type'] == 'dir' ) {
+ $this->recoverAllFiles( $filePath . '/', $privateKey );
} else {
- $file = substr($filePath, 0, -4);
- $this->recoverFile($file, $privateKey);
+ $file = substr( $filePath, 0, -4 );
+ $this->recoverFile( $file, $privateKey );
}
}
}
@@ -1479,19 +1443,18 @@ class Util
* @brief recover users files in case of password lost
* @param string $recoveryPassword
*/
- public function recoverUsersFiles($recoveryPassword)
- {
+ public function recoverUsersFiles( $recoveryPassword ) {
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $encryptedKey = $this->view->file_get_contents('/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
- $privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $recoveryPassword);
+ $encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $this->recoveryKeyId . '.private.key' );
+ $privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $recoveryPassword );
\OC_FileProxy::$enabled = $proxyStatus;
- $this->recoverAllFiles('/', $privateKey);
+ $this->recoverAllFiles( '/', $privateKey );
}
}
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
index 66efc58436..6cc5b997fd 100644
--- a/apps/files_encryption/settings-admin.php
+++ b/apps/files_encryption/settings-admin.php
@@ -15,7 +15,6 @@ $view = new OC_FilesystemView( '' );
$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
-$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
\OCP\Util::addscript( 'files_encryption', 'settings-admin' );
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index ada8ffbc31..57f7f58452 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -26,4 +26,3 @@ $tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );
return $tmpl->fetchPage();
-return null;
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 14e8ce960a..04d6e79179 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -29,18 +29,5 @@
</p>
<?php endif; ?>
<br />
-<!--
- <p>
- <label for="encryptAll"><?php p( $l->t( "Scan for unencrypted files and encrypt them" ) ); ?></label>
- <br />
- <em><?php p( $l->t( "Use this if you suspect that you still have files which are unencrypted, or encrypted using ownCloud 4 or older." ) ); ?></em>
- <br />
- <input type="submit" id="encryptAll" name="encryptAll" value="<?php p( $l->t( 'Scan and encrypt files' ) ); ?>" />
- <input type="password" name="userPassword" id="userPassword" />
- <label for="encryptAll"><?php p( $l->t( "Account password" ) ); ?></label>
- <div id="encryptAllSuccess"><?php p( $l->t( 'Scan complete' ) );?></div>
- <div id="encryptAllError"><?php p( $l->t( 'Unable to scan and encrypt files' ) );?></div>
- </p>
--->
</fieldset>
</form>
--
GitLab
From b47729c5fc6586f6fc5f51cbca967b1ced76b24e Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 24 May 2013 02:02:43 +0200
Subject: [PATCH 297/304] [tx-robot] updated from transifex
---
apps/files/l10n/el.php | 1 +
apps/files/l10n/ru_RU.php | 15 +++++-
apps/files_external/l10n/ru_RU.php | 21 +--------
apps/files_sharing/l10n/ru_RU.php | 8 +---
apps/files_trashbin/l10n/ru_RU.php | 4 +-
apps/user_ldap/l10n/de_DE.php | 1 +
core/l10n/ar.php | 4 +-
core/l10n/bg_BG.php | 2 +-
core/l10n/bn_BD.php | 4 +-
core/l10n/ca.php | 4 +-
core/l10n/cs_CZ.php | 4 +-
core/l10n/cy_GB.php | 4 +-
core/l10n/da.php | 4 +-
core/l10n/de.php | 4 +-
core/l10n/de_DE.php | 4 +-
core/l10n/el.php | 4 +-
core/l10n/eo.php | 4 +-
core/l10n/es.php | 4 +-
core/l10n/es_AR.php | 4 +-
core/l10n/et_EE.php | 4 +-
core/l10n/eu.php | 4 +-
core/l10n/fa.php | 4 +-
core/l10n/fi_FI.php | 6 ++-
core/l10n/fr.php | 4 +-
core/l10n/gl.php | 4 +-
core/l10n/he.php | 4 +-
core/l10n/hr.php | 4 +-
core/l10n/hu_HU.php | 4 +-
core/l10n/id.php | 4 +-
core/l10n/is.php | 4 +-
core/l10n/it.php | 5 +-
core/l10n/ja_JP.php | 4 +-
core/l10n/ka_GE.php | 4 +-
core/l10n/ko.php | 4 +-
core/l10n/lb.php | 4 +-
core/l10n/lt_LT.php | 4 +-
core/l10n/lv.php | 4 +-
core/l10n/mk.php | 4 +-
core/l10n/ms_MY.php | 2 +-
core/l10n/my_MM.php | 4 +-
core/l10n/nb_NO.php | 4 +-
core/l10n/nl.php | 4 +-
core/l10n/nn_NO.php | 4 +-
core/l10n/oc.php | 4 +-
core/l10n/pl.php | 4 +-
core/l10n/pt_BR.php | 4 +-
core/l10n/pt_PT.php | 4 +-
core/l10n/ro.php | 4 +-
core/l10n/ru.php | 4 +-
core/l10n/ru_RU.php | 5 +-
core/l10n/si_LK.php | 4 +-
core/l10n/sk_SK.php | 4 +-
core/l10n/sl.php | 4 +-
core/l10n/sq.php | 4 +-
core/l10n/sr.php | 4 +-
core/l10n/sv.php | 4 +-
core/l10n/ta_LK.php | 4 +-
core/l10n/te.php | 2 +-
core/l10n/th_TH.php | 4 +-
core/l10n/tr.php | 4 +-
core/l10n/ug.php | 2 +-
core/l10n/uk.php | 4 +-
core/l10n/ur_PK.php | 4 +-
core/l10n/vi.php | 4 +-
core/l10n/zh_CN.GB2312.php | 4 +-
core/l10n/zh_CN.php | 4 +-
core/l10n/zh_HK.php | 2 +-
core/l10n/zh_TW.php | 4 +-
l10n/af_ZA/core.po | 22 +++++----
l10n/af_ZA/lib.po | 68 ++++++++++++++-------------
l10n/ar/core.po | 26 +++++-----
l10n/ar/files.po | 4 +-
l10n/ar/files_external.po | 4 +-
l10n/ar/files_sharing.po | 4 +-
l10n/ar/files_trashbin.po | 4 +-
l10n/ar/lib.po | 70 ++++++++++++++-------------
l10n/ar/settings.po | 4 +-
l10n/ar/user_ldap.po | 4 +-
l10n/bg_BG/core.po | 24 ++++++----
l10n/bg_BG/files.po | 4 +-
l10n/bg_BG/files_external.po | 4 +-
l10n/bg_BG/files_sharing.po | 4 +-
l10n/bg_BG/files_trashbin.po | 4 +-
l10n/bg_BG/lib.po | 70 ++++++++++++++-------------
l10n/bg_BG/settings.po | 4 +-
l10n/bg_BG/user_ldap.po | 4 +-
l10n/bn_BD/core.po | 26 +++++-----
l10n/bn_BD/files.po | 4 +-
l10n/bn_BD/files_external.po | 4 +-
l10n/bn_BD/files_sharing.po | 4 +-
l10n/bn_BD/files_trashbin.po | 4 +-
l10n/bn_BD/lib.po | 68 ++++++++++++++-------------
l10n/bn_BD/settings.po | 4 +-
l10n/bn_BD/user_ldap.po | 4 +-
l10n/ca/core.po | 26 +++++-----
l10n/ca/files.po | 4 +-
l10n/ca/files_external.po | 8 ++--
l10n/ca/files_sharing.po | 4 +-
l10n/ca/files_trashbin.po | 4 +-
l10n/ca/lib.po | 70 ++++++++++++++-------------
l10n/ca/settings.po | 4 +-
l10n/ca/user_ldap.po | 4 +-
l10n/cs_CZ/core.po | 26 +++++-----
l10n/cs_CZ/files.po | 4 +-
l10n/cs_CZ/files_external.po | 4 +-
l10n/cs_CZ/files_sharing.po | 4 +-
l10n/cs_CZ/files_trashbin.po | 4 +-
l10n/cs_CZ/lib.po | 70 ++++++++++++++-------------
l10n/cs_CZ/settings.po | 4 +-
l10n/cs_CZ/user_ldap.po | 4 +-
l10n/cy_GB/core.po | 26 +++++-----
l10n/cy_GB/files.po | 4 +-
l10n/cy_GB/files_external.po | 4 +-
l10n/cy_GB/files_sharing.po | 4 +-
l10n/cy_GB/files_trashbin.po | 4 +-
l10n/cy_GB/lib.po | 70 ++++++++++++++-------------
l10n/cy_GB/settings.po | 4 +-
l10n/cy_GB/user_ldap.po | 4 +-
l10n/da/core.po | 26 +++++-----
l10n/da/files.po | 4 +-
l10n/da/files_external.po | 4 +-
l10n/da/files_sharing.po | 4 +-
l10n/da/files_trashbin.po | 4 +-
l10n/da/lib.po | 70 ++++++++++++++-------------
l10n/da/settings.po | 4 +-
l10n/da/user_ldap.po | 4 +-
l10n/de/core.po | 26 +++++-----
l10n/de/files.po | 4 +-
l10n/de/files_external.po | 4 +-
l10n/de/files_sharing.po | 4 +-
l10n/de/files_trashbin.po | 4 +-
l10n/de/lib.po | 62 ++++++++++++------------
l10n/de/settings.po | 4 +-
l10n/de/user_ldap.po | 4 +-
l10n/de_DE/core.po | 26 +++++-----
l10n/de_DE/files.po | 4 +-
l10n/de_DE/files_external.po | 4 +-
l10n/de_DE/files_sharing.po | 4 +-
l10n/de_DE/files_trashbin.po | 4 +-
l10n/de_DE/lib.po | 62 ++++++++++++------------
l10n/de_DE/settings.po | 4 +-
l10n/de_DE/user_ldap.po | 9 ++--
l10n/el/core.po | 28 ++++++-----
l10n/el/files.po | 9 ++--
l10n/el/files_external.po | 4 +-
l10n/el/files_sharing.po | 4 +-
l10n/el/files_trashbin.po | 4 +-
l10n/el/lib.po | 70 ++++++++++++++-------------
l10n/el/settings.po | 4 +-
l10n/el/user_ldap.po | 4 +-
l10n/en@pirate/files.po | 4 +-
l10n/en@pirate/files_sharing.po | 4 +-
l10n/eo/core.po | 26 +++++-----
l10n/eo/files.po | 4 +-
l10n/eo/files_external.po | 4 +-
l10n/eo/files_sharing.po | 4 +-
l10n/eo/files_trashbin.po | 4 +-
l10n/eo/lib.po | 68 ++++++++++++++-------------
l10n/eo/settings.po | 4 +-
l10n/eo/user_ldap.po | 4 +-
l10n/es/core.po | 26 +++++-----
l10n/es/files.po | 4 +-
l10n/es/files_external.po | 4 +-
l10n/es/files_sharing.po | 4 +-
l10n/es/files_trashbin.po | 4 +-
l10n/es/lib.po | 62 ++++++++++++------------
l10n/es/settings.po | 4 +-
l10n/es/user_ldap.po | 4 +-
l10n/es_AR/core.po | 26 +++++-----
l10n/es_AR/files.po | 4 +-
l10n/es_AR/files_external.po | 4 +-
l10n/es_AR/files_sharing.po | 4 +-
l10n/es_AR/files_trashbin.po | 4 +-
l10n/es_AR/lib.po | 70 ++++++++++++++-------------
l10n/es_AR/settings.po | 4 +-
l10n/es_AR/user_ldap.po | 4 +-
l10n/et_EE/core.po | 26 +++++-----
l10n/et_EE/files.po | 4 +-
l10n/et_EE/files_external.po | 4 +-
l10n/et_EE/files_sharing.po | 4 +-
l10n/et_EE/files_trashbin.po | 4 +-
l10n/et_EE/lib.po | 62 ++++++++++++------------
l10n/et_EE/settings.po | 4 +-
l10n/et_EE/user_ldap.po | 4 +-
l10n/eu/core.po | 26 +++++-----
l10n/eu/files.po | 4 +-
l10n/eu/files_external.po | 4 +-
l10n/eu/files_sharing.po | 4 +-
l10n/eu/files_trashbin.po | 4 +-
l10n/eu/lib.po | 70 ++++++++++++++-------------
l10n/eu/settings.po | 4 +-
l10n/eu/user_ldap.po | 4 +-
l10n/fa/core.po | 26 +++++-----
l10n/fa/files.po | 4 +-
l10n/fa/files_external.po | 4 +-
l10n/fa/files_sharing.po | 4 +-
l10n/fa/files_trashbin.po | 4 +-
l10n/fa/lib.po | 68 ++++++++++++++-------------
l10n/fa/settings.po | 4 +-
l10n/fa/user_ldap.po | 4 +-
l10n/fi/core.po | 24 ++++++----
l10n/fi/files.po | 6 +--
l10n/fi/lib.po | 70 ++++++++++++++-------------
l10n/fi_FI/core.po | 32 +++++++------
l10n/fi_FI/files.po | 4 +-
l10n/fi_FI/files_external.po | 4 +-
l10n/fi_FI/files_sharing.po | 4 +-
l10n/fi_FI/files_trashbin.po | 4 +-
l10n/fi_FI/lib.po | 73 +++++++++++++++--------------
l10n/fi_FI/settings.po | 4 +-
l10n/fi_FI/user_ldap.po | 4 +-
l10n/fr/core.po | 26 +++++-----
l10n/fr/files.po | 4 +-
l10n/fr/files_external.po | 4 +-
l10n/fr/files_sharing.po | 4 +-
l10n/fr/files_trashbin.po | 4 +-
l10n/fr/lib.po | 70 ++++++++++++++-------------
l10n/fr/settings.po | 4 +-
l10n/fr/user_ldap.po | 4 +-
l10n/gl/core.po | 26 +++++-----
l10n/gl/files.po | 4 +-
l10n/gl/files_external.po | 4 +-
l10n/gl/files_sharing.po | 4 +-
l10n/gl/files_trashbin.po | 4 +-
l10n/gl/lib.po | 70 ++++++++++++++-------------
l10n/gl/settings.po | 4 +-
l10n/gl/user_ldap.po | 4 +-
l10n/he/core.po | 26 +++++-----
l10n/he/files.po | 4 +-
l10n/he/files_external.po | 4 +-
l10n/he/files_sharing.po | 4 +-
l10n/he/files_trashbin.po | 4 +-
l10n/he/lib.po | 68 ++++++++++++++-------------
l10n/he/settings.po | 4 +-
l10n/he/user_ldap.po | 4 +-
l10n/hi/core.po | 22 +++++----
l10n/hi/lib.po | 68 ++++++++++++++-------------
l10n/hr/core.po | 26 +++++-----
l10n/hr/files.po | 4 +-
l10n/hr/files_external.po | 4 +-
l10n/hr/files_sharing.po | 4 +-
l10n/hr/files_trashbin.po | 4 +-
l10n/hr/lib.po | 68 ++++++++++++++-------------
l10n/hr/settings.po | 4 +-
l10n/hr/user_ldap.po | 4 +-
l10n/hu_HU/core.po | 26 +++++-----
l10n/hu_HU/files.po | 4 +-
l10n/hu_HU/files_external.po | 4 +-
l10n/hu_HU/files_sharing.po | 4 +-
l10n/hu_HU/files_trashbin.po | 4 +-
l10n/hu_HU/lib.po | 70 ++++++++++++++-------------
l10n/hu_HU/settings.po | 4 +-
l10n/hu_HU/user_ldap.po | 4 +-
l10n/hy/files.po | 6 +--
l10n/hy/files_external.po | 4 +-
l10n/hy/files_sharing.po | 4 +-
l10n/hy/files_trashbin.po | 4 +-
l10n/hy/settings.po | 26 +++++-----
l10n/ia/core.po | 22 +++++----
l10n/ia/files.po | 4 +-
l10n/ia/files_external.po | 4 +-
l10n/ia/files_sharing.po | 4 +-
l10n/ia/files_trashbin.po | 4 +-
l10n/ia/lib.po | 68 ++++++++++++++-------------
l10n/ia/settings.po | 4 +-
l10n/ia/user_ldap.po | 4 +-
l10n/id/core.po | 26 +++++-----
l10n/id/files.po | 4 +-
l10n/id/files_external.po | 4 +-
l10n/id/files_sharing.po | 4 +-
l10n/id/files_trashbin.po | 4 +-
l10n/id/lib.po | 70 ++++++++++++++-------------
l10n/id/settings.po | 4 +-
l10n/id/user_ldap.po | 4 +-
l10n/is/core.po | 26 +++++-----
l10n/is/files.po | 4 +-
l10n/is/files_external.po | 4 +-
l10n/is/files_sharing.po | 4 +-
l10n/is/files_trashbin.po | 4 +-
l10n/is/lib.po | 68 ++++++++++++++-------------
l10n/is/settings.po | 4 +-
l10n/is/user_ldap.po | 4 +-
l10n/it/core.po | 26 +++++-----
l10n/it/files.po | 4 +-
l10n/it/files_external.po | 4 +-
l10n/it/files_sharing.po | 4 +-
l10n/it/files_trashbin.po | 4 +-
l10n/it/lib.po | 63 +++++++++++++------------
l10n/it/settings.po | 4 +-
l10n/it/user_ldap.po | 4 +-
l10n/ja_JP/core.po | 26 +++++-----
l10n/ja_JP/files.po | 4 +-
l10n/ja_JP/files_external.po | 4 +-
l10n/ja_JP/files_sharing.po | 4 +-
l10n/ja_JP/files_trashbin.po | 4 +-
l10n/ja_JP/lib.po | 70 ++++++++++++++-------------
l10n/ja_JP/settings.po | 4 +-
l10n/ja_JP/user_ldap.po | 4 +-
l10n/ka/files.po | 4 +-
l10n/ka/files_sharing.po | 4 +-
l10n/ka_GE/core.po | 26 +++++-----
l10n/ka_GE/files.po | 4 +-
l10n/ka_GE/files_external.po | 4 +-
l10n/ka_GE/files_sharing.po | 4 +-
l10n/ka_GE/files_trashbin.po | 4 +-
l10n/ka_GE/lib.po | 70 ++++++++++++++-------------
l10n/ka_GE/settings.po | 4 +-
l10n/ka_GE/user_ldap.po | 4 +-
l10n/ko/core.po | 26 +++++-----
l10n/ko/files.po | 4 +-
l10n/ko/files_external.po | 4 +-
l10n/ko/files_sharing.po | 4 +-
l10n/ko/files_trashbin.po | 4 +-
l10n/ko/lib.po | 68 ++++++++++++++-------------
l10n/ko/settings.po | 4 +-
l10n/ko/user_ldap.po | 4 +-
l10n/ku_IQ/core.po | 22 +++++----
l10n/ku_IQ/files.po | 4 +-
l10n/ku_IQ/files_sharing.po | 4 +-
l10n/ku_IQ/files_trashbin.po | 4 +-
l10n/ku_IQ/lib.po | 68 ++++++++++++++-------------
l10n/ku_IQ/settings.po | 4 +-
l10n/ku_IQ/user_ldap.po | 4 +-
l10n/lb/core.po | 26 +++++-----
l10n/lb/files.po | 4 +-
l10n/lb/files_external.po | 4 +-
l10n/lb/files_sharing.po | 4 +-
l10n/lb/files_trashbin.po | 4 +-
l10n/lb/lib.po | 68 ++++++++++++++-------------
l10n/lb/settings.po | 4 +-
l10n/lb/user_ldap.po | 4 +-
l10n/lt_LT/core.po | 26 +++++-----
l10n/lt_LT/files.po | 4 +-
l10n/lt_LT/files_external.po | 4 +-
l10n/lt_LT/files_sharing.po | 4 +-
l10n/lt_LT/files_trashbin.po | 4 +-
l10n/lt_LT/lib.po | 68 ++++++++++++++-------------
l10n/lt_LT/settings.po | 4 +-
l10n/lt_LT/user_ldap.po | 4 +-
l10n/lv/core.po | 26 +++++-----
l10n/lv/files.po | 4 +-
l10n/lv/files_external.po | 4 +-
l10n/lv/files_sharing.po | 4 +-
l10n/lv/files_trashbin.po | 4 +-
l10n/lv/lib.po | 70 ++++++++++++++-------------
l10n/lv/settings.po | 4 +-
l10n/lv/user_ldap.po | 4 +-
l10n/mk/core.po | 26 +++++-----
l10n/mk/files.po | 4 +-
l10n/mk/files_external.po | 4 +-
l10n/mk/files_sharing.po | 4 +-
l10n/mk/files_trashbin.po | 4 +-
l10n/mk/lib.po | 68 ++++++++++++++-------------
l10n/mk/settings.po | 4 +-
l10n/mk/user_ldap.po | 4 +-
l10n/ms_MY/core.po | 24 ++++++----
l10n/ms_MY/files.po | 4 +-
l10n/ms_MY/files_external.po | 4 +-
l10n/ms_MY/files_sharing.po | 4 +-
l10n/ms_MY/files_trashbin.po | 4 +-
l10n/ms_MY/lib.po | 68 ++++++++++++++-------------
l10n/ms_MY/settings.po | 4 +-
l10n/ms_MY/user_ldap.po | 4 +-
l10n/my_MM/core.po | 26 +++++-----
l10n/my_MM/files.po | 4 +-
l10n/my_MM/files_sharing.po | 4 +-
l10n/my_MM/lib.po | 68 ++++++++++++++-------------
l10n/nb_NO/core.po | 26 +++++-----
l10n/nb_NO/files.po | 4 +-
l10n/nb_NO/files_external.po | 4 +-
l10n/nb_NO/files_sharing.po | 4 +-
l10n/nb_NO/files_trashbin.po | 4 +-
l10n/nb_NO/lib.po | 60 +++++++++++++-----------
l10n/nb_NO/settings.po | 4 +-
l10n/nb_NO/user_ldap.po | 4 +-
l10n/nl/core.po | 26 +++++-----
l10n/nl/files.po | 4 +-
l10n/nl/files_external.po | 4 +-
l10n/nl/files_sharing.po | 4 +-
l10n/nl/files_trashbin.po | 4 +-
l10n/nl/lib.po | 70 ++++++++++++++-------------
l10n/nl/settings.po | 4 +-
l10n/nl/user_ldap.po | 4 +-
l10n/nn_NO/core.po | 26 +++++-----
l10n/nn_NO/files.po | 4 +-
l10n/nn_NO/files_external.po | 4 +-
l10n/nn_NO/files_sharing.po | 4 +-
l10n/nn_NO/files_trashbin.po | 4 +-
l10n/nn_NO/lib.po | 60 +++++++++++++-----------
l10n/nn_NO/settings.po | 4 +-
l10n/nn_NO/user_ldap.po | 4 +-
l10n/oc/core.po | 26 +++++-----
l10n/oc/files.po | 4 +-
l10n/oc/files_external.po | 4 +-
l10n/oc/files_sharing.po | 4 +-
l10n/oc/files_trashbin.po | 4 +-
l10n/oc/lib.po | 68 ++++++++++++++-------------
l10n/oc/settings.po | 4 +-
l10n/oc/user_ldap.po | 4 +-
l10n/pl/core.po | 26 +++++-----
l10n/pl/files.po | 4 +-
l10n/pl/files_external.po | 4 +-
l10n/pl/files_sharing.po | 4 +-
l10n/pl/files_trashbin.po | 4 +-
l10n/pl/lib.po | 70 ++++++++++++++-------------
l10n/pl/settings.po | 4 +-
l10n/pl/user_ldap.po | 4 +-
l10n/pl_PL/core.po | 24 ++++++----
l10n/pl_PL/files.po | 6 +--
l10n/pl_PL/lib.po | 70 ++++++++++++++-------------
l10n/pl_PL/settings.po | 26 +++++-----
l10n/pt_BR/core.po | 26 +++++-----
l10n/pt_BR/files.po | 4 +-
l10n/pt_BR/files_external.po | 4 +-
l10n/pt_BR/files_sharing.po | 4 +-
l10n/pt_BR/files_trashbin.po | 4 +-
l10n/pt_BR/lib.po | 73 +++++++++++++++--------------
l10n/pt_BR/settings.po | 4 +-
l10n/pt_BR/user_ldap.po | 4 +-
l10n/pt_PT/core.po | 26 +++++-----
l10n/pt_PT/files.po | 4 +-
l10n/pt_PT/files_external.po | 4 +-
l10n/pt_PT/files_sharing.po | 4 +-
l10n/pt_PT/files_trashbin.po | 4 +-
l10n/pt_PT/lib.po | 70 ++++++++++++++-------------
l10n/pt_PT/settings.po | 4 +-
l10n/pt_PT/user_ldap.po | 4 +-
l10n/ro/core.po | 26 +++++-----
l10n/ro/files.po | 4 +-
l10n/ro/files_external.po | 4 +-
l10n/ro/files_sharing.po | 4 +-
l10n/ro/files_trashbin.po | 4 +-
l10n/ro/lib.po | 68 ++++++++++++++-------------
l10n/ro/settings.po | 4 +-
l10n/ro/user_ldap.po | 4 +-
l10n/ru/core.po | 26 +++++-----
l10n/ru/files.po | 4 +-
l10n/ru/files_external.po | 4 +-
l10n/ru/files_sharing.po | 4 +-
l10n/ru/files_trashbin.po | 4 +-
l10n/ru/lib.po | 70 ++++++++++++++-------------
l10n/ru/settings.po | 4 +-
l10n/ru/user_ldap.po | 4 +-
l10n/ru_RU/core.po | 30 +++++++-----
l10n/ru_RU/files.po | 30 ++++++------
l10n/ru_RU/files_external.po | 45 +++++++++---------
l10n/ru_RU/files_sharing.po | 19 ++++----
l10n/ru_RU/files_trashbin.po | 8 ++--
l10n/ru_RU/lib.po | 72 ++++++++++++++--------------
l10n/ru_RU/settings.po | 12 ++---
l10n/ru_RU/user_ldap.po | 4 +-
l10n/si_LK/core.po | 26 +++++-----
l10n/si_LK/files.po | 4 +-
l10n/si_LK/files_external.po | 4 +-
l10n/si_LK/files_sharing.po | 4 +-
l10n/si_LK/files_trashbin.po | 4 +-
l10n/si_LK/lib.po | 68 ++++++++++++++-------------
l10n/si_LK/settings.po | 4 +-
l10n/si_LK/user_ldap.po | 4 +-
l10n/sk_SK/core.po | 26 +++++-----
l10n/sk_SK/files.po | 4 +-
l10n/sk_SK/files_external.po | 4 +-
l10n/sk_SK/files_sharing.po | 4 +-
l10n/sk_SK/files_trashbin.po | 4 +-
l10n/sk_SK/lib.po | 70 ++++++++++++++-------------
l10n/sk_SK/settings.po | 4 +-
l10n/sk_SK/user_ldap.po | 4 +-
l10n/sl/core.po | 26 +++++-----
l10n/sl/files.po | 4 +-
l10n/sl/files_external.po | 4 +-
l10n/sl/files_sharing.po | 4 +-
l10n/sl/files_trashbin.po | 4 +-
l10n/sl/lib.po | 70 ++++++++++++++-------------
l10n/sl/settings.po | 4 +-
l10n/sl/user_ldap.po | 4 +-
l10n/sq/core.po | 26 +++++-----
l10n/sq/files.po | 4 +-
l10n/sq/files_external.po | 4 +-
l10n/sq/files_sharing.po | 4 +-
l10n/sq/files_trashbin.po | 4 +-
l10n/sq/lib.po | 70 ++++++++++++++-------------
l10n/sq/settings.po | 4 +-
l10n/sq/user_ldap.po | 4 +-
l10n/sr/core.po | 26 +++++-----
l10n/sr/files.po | 4 +-
l10n/sr/files_external.po | 4 +-
l10n/sr/files_sharing.po | 4 +-
l10n/sr/files_trashbin.po | 4 +-
l10n/sr/lib.po | 68 ++++++++++++++-------------
l10n/sr/settings.po | 4 +-
l10n/sr/user_ldap.po | 4 +-
l10n/sr@latin/core.po | 22 +++++----
l10n/sr@latin/files.po | 4 +-
l10n/sr@latin/files_external.po | 4 +-
l10n/sr@latin/files_sharing.po | 4 +-
l10n/sr@latin/files_trashbin.po | 4 +-
l10n/sr@latin/lib.po | 68 ++++++++++++++-------------
l10n/sr@latin/settings.po | 26 +++++-----
l10n/sv/core.po | 26 +++++-----
l10n/sv/files.po | 4 +-
l10n/sv/files_external.po | 4 +-
l10n/sv/files_sharing.po | 4 +-
l10n/sv/files_trashbin.po | 4 +-
l10n/sv/lib.po | 68 ++++++++++++++-------------
l10n/sv/settings.po | 4 +-
l10n/sv/user_ldap.po | 4 +-
l10n/ta_LK/core.po | 26 +++++-----
l10n/ta_LK/files.po | 4 +-
l10n/ta_LK/files_external.po | 4 +-
l10n/ta_LK/files_sharing.po | 4 +-
l10n/ta_LK/files_trashbin.po | 4 +-
l10n/ta_LK/lib.po | 68 ++++++++++++++-------------
l10n/ta_LK/settings.po | 4 +-
l10n/ta_LK/user_ldap.po | 4 +-
l10n/te/core.po | 24 ++++++----
l10n/te/files.po | 4 +-
l10n/te/files_external.po | 4 +-
l10n/te/files_trashbin.po | 4 +-
l10n/te/lib.po | 68 ++++++++++++++-------------
l10n/te/settings.po | 4 +-
l10n/te/user_ldap.po | 4 +-
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 26 +++++-----
l10n/th_TH/files.po | 4 +-
l10n/th_TH/files_external.po | 4 +-
l10n/th_TH/files_sharing.po | 4 +-
l10n/th_TH/files_trashbin.po | 4 +-
l10n/th_TH/lib.po | 68 ++++++++++++++-------------
l10n/th_TH/settings.po | 4 +-
l10n/th_TH/user_ldap.po | 4 +-
l10n/tr/core.po | 26 +++++-----
l10n/tr/files.po | 4 +-
l10n/tr/files_external.po | 4 +-
l10n/tr/files_sharing.po | 4 +-
l10n/tr/files_trashbin.po | 4 +-
l10n/tr/lib.po | 62 ++++++++++++------------
l10n/tr/settings.po | 4 +-
l10n/tr/user_ldap.po | 4 +-
l10n/ug/core.po | 24 ++++++----
l10n/ug/files.po | 4 +-
l10n/ug/files_external.po | 4 +-
l10n/ug/files_sharing.po | 4 +-
l10n/ug/files_trashbin.po | 4 +-
l10n/ug/lib.po | 60 +++++++++++++-----------
l10n/ug/settings.po | 4 +-
l10n/ug/user_ldap.po | 4 +-
l10n/uk/core.po | 26 +++++-----
l10n/uk/files.po | 4 +-
l10n/uk/files_external.po | 4 +-
l10n/uk/files_sharing.po | 4 +-
l10n/uk/files_trashbin.po | 4 +-
l10n/uk/lib.po | 70 ++++++++++++++-------------
l10n/uk/settings.po | 4 +-
l10n/uk/user_ldap.po | 4 +-
l10n/ur_PK/core.po | 26 +++++-----
l10n/ur_PK/files.po | 4 +-
l10n/ur_PK/files_trashbin.po | 4 +-
l10n/ur_PK/lib.po | 68 ++++++++++++++-------------
l10n/ur_PK/settings.po | 4 +-
l10n/ur_PK/user_ldap.po | 4 +-
l10n/vi/core.po | 26 +++++-----
l10n/vi/files.po | 4 +-
l10n/vi/files_external.po | 4 +-
l10n/vi/files_sharing.po | 4 +-
l10n/vi/files_trashbin.po | 4 +-
l10n/vi/lib.po | 68 ++++++++++++++-------------
l10n/vi/settings.po | 4 +-
l10n/vi/user_ldap.po | 4 +-
l10n/zh_CN.GB2312/core.po | 26 +++++-----
l10n/zh_CN.GB2312/files.po | 4 +-
l10n/zh_CN.GB2312/files_external.po | 4 +-
l10n/zh_CN.GB2312/files_sharing.po | 4 +-
l10n/zh_CN.GB2312/files_trashbin.po | 4 +-
l10n/zh_CN.GB2312/lib.po | 68 ++++++++++++++-------------
l10n/zh_CN.GB2312/settings.po | 4 +-
l10n/zh_CN.GB2312/user_ldap.po | 4 +-
l10n/zh_CN/core.po | 26 +++++-----
l10n/zh_CN/files.po | 4 +-
l10n/zh_CN/files_external.po | 4 +-
l10n/zh_CN/files_sharing.po | 4 +-
l10n/zh_CN/files_trashbin.po | 4 +-
l10n/zh_CN/lib.po | 70 ++++++++++++++-------------
l10n/zh_CN/settings.po | 4 +-
l10n/zh_CN/user_ldap.po | 4 +-
l10n/zh_HK/core.po | 24 ++++++----
l10n/zh_HK/files.po | 4 +-
l10n/zh_HK/files_external.po | 4 +-
l10n/zh_HK/files_sharing.po | 4 +-
l10n/zh_HK/files_trashbin.po | 4 +-
l10n/zh_HK/lib.po | 68 ++++++++++++++-------------
l10n/zh_HK/settings.po | 4 +-
l10n/zh_HK/user_ldap.po | 4 +-
l10n/zh_TW/core.po | 26 +++++-----
l10n/zh_TW/files.po | 4 +-
l10n/zh_TW/files_external.po | 4 +-
l10n/zh_TW/files_sharing.po | 4 +-
l10n/zh_TW/files_trashbin.po | 4 +-
l10n/zh_TW/lib.po | 70 ++++++++++++++-------------
l10n/zh_TW/settings.po | 4 +-
l10n/zh_TW/user_ldap.po | 4 +-
lib/l10n/ar.php | 2 +-
lib/l10n/bg_BG.php | 2 +-
lib/l10n/ca.php | 2 +-
lib/l10n/cs_CZ.php | 2 +-
lib/l10n/cy_GB.php | 2 +-
lib/l10n/da.php | 2 +-
lib/l10n/de.php | 2 +-
lib/l10n/de_DE.php | 2 +-
lib/l10n/el.php | 2 +-
lib/l10n/es.php | 2 +-
lib/l10n/es_AR.php | 2 +-
lib/l10n/et_EE.php | 2 +-
lib/l10n/eu.php | 2 +-
lib/l10n/fi_FI.php | 3 +-
lib/l10n/fr.php | 2 +-
lib/l10n/gl.php | 2 +-
lib/l10n/hu_HU.php | 2 +-
lib/l10n/id.php | 2 +-
lib/l10n/it.php | 3 +-
lib/l10n/ja_JP.php | 2 +-
lib/l10n/ka_GE.php | 2 +-
lib/l10n/lv.php | 2 +-
lib/l10n/nl.php | 2 +-
lib/l10n/pl.php | 2 +-
lib/l10n/pt_BR.php | 3 +-
lib/l10n/pt_PT.php | 2 +-
lib/l10n/ru.php | 2 +-
lib/l10n/ru_RU.php | 3 +-
lib/l10n/sk_SK.php | 2 +-
lib/l10n/sl.php | 2 +-
lib/l10n/sq.php | 2 +-
lib/l10n/tr.php | 2 +-
lib/l10n/uk.php | 2 +-
lib/l10n/zh_CN.php | 2 +-
lib/l10n/zh_TW.php | 2 +-
settings/l10n/ru_RU.php | 6 ++-
646 files changed, 4591 insertions(+), 4030 deletions(-)
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index a8bb96cdfc..b273f6b522 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -46,6 +46,7 @@
"{count} folders" => "{count} φάκελοι",
"1 file" => "1 αÏχείο",
"{count} files" => "{count} αÏχεία",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη ÎγκυÏο όνομα φακÎλου. Η χÏήση του 'ΚοινόχÏηστος' χÏησιμοποιείται από το ownCloud",
"Unable to rename file" => "Αδυναμία μετονομασίας αÏχείου",
"Upload" => "ΜεταφόÏτωση",
"File handling" => "ΔιαχείÏιση αÏχείων",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 1ef163d48f..e0bfab3321 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,3 +1,16 @@
<?php $TRANSLATIONS = array(
-"Error" => "Ошибка"
+"No file was uploaded. Unknown error" => "Файл не был загружен. ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°",
+"There is no error, the file uploaded with success" => "Ошибки нет, файл уÑпешно загружен",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загружаемого файла превыÑил макÑимально допуÑтимый в директиве MAX_FILE_SIZE, Ñпецифицированной в HTML-форме",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен лишь чаÑтично",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "ОтÑутÑтвие временной папки",
+"Failed to write to disk" => "Ðе удалоÑÑŒ запиÑать на диÑк",
+"Not enough storage available" => "ÐедоÑтаточно меÑта в хранилище",
+"Share" => "Сделать общим",
+"Delete" => "Удалить",
+"Error" => "Ошибка",
+"Name" => "ИмÑ",
+"Save" => "Сохранить",
+"Download" => "Загрузка"
);
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index 406e284b27..a43417dfbc 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -1,23 +1,4 @@
<?php $TRANSLATIONS = array(
-"Access granted" => "ДоÑтуп разрешен",
-"Error configuring Dropbox storage" => "Ошибка при конфигурировании хранилища Dropbox",
-"Grant access" => "ПредоÑтавить доÑтуп",
-"Please provide a valid Dropbox app key and secret." => "ПожалуйÑта предÑтавьте допуÑтимый ключ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Dropbox и пароль.",
-"Error configuring Google Drive storage" => "Ошибка наÑтройки хранилища Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> \"smbclient\" не уÑтановлен. Подключение общих папок CIFS/SMB невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы уÑтановить его.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не уÑтановлена. Подключение по FTP невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы уÑтановить ее.",
-"External Storage" => "Внешние ÑиÑтемы Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
-"Folder name" => "Ð˜Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸",
-"Configuration" => "КонфигурациÑ",
-"Options" => "Опции",
-"Applicable" => "Применимый",
-"None set" => "Ðе задан",
-"All Users" => "Ð’Ñе пользователи",
"Groups" => "Группы",
-"Users" => "Пользователи",
-"Delete" => "Удалить",
-"Enable User External Storage" => "Включить пользовательÑкую внешнюю ÑиÑтему Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
-"Allow users to mount their own external storage" => "Разрешить пользователÑм монтировать их ÑобÑтвенную внешнюю ÑиÑтему Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
-"SSL root certificates" => "Корневые Ñертификаты SSL",
-"Import Root Certificate" => "Импортировать корневые Ñертификаты"
+"Delete" => "Удалить"
);
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
index 36e4b2fd0e..2cadd16346 100644
--- a/apps/files_sharing/l10n/ru_RU.php
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -1,9 +1,3 @@
<?php $TRANSLATIONS = array(
-"Password" => "Пароль",
-"Submit" => "Передать",
-"%s shared the folder %s with you" => "%s имеет общий Ñ Ð’Ð°Ð¼Ð¸ доÑтуп к папке %s ",
-"%s shared the file %s with you" => "%s имеет общий Ñ Ð’Ð°Ð¼Ð¸ доÑтуп к файлу %s ",
-"Download" => "Загрузка",
-"No preview available for" => "Предварительный проÑмотр недоÑтупен",
-"web services under your control" => "веб-ÑервиÑÑ‹ под Вашим контролем"
+"Download" => "Загрузка"
);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 1ef163d48f..8636e417ec 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,3 +1,5 @@
<?php $TRANSLATIONS = array(
-"Error" => "Ошибка"
+"Error" => "Ошибка",
+"Name" => "ИмÑ",
+"Delete" => "Удалить"
);
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index de2dd118e5..e22c5b5bdd 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -73,6 +73,7 @@
"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
"Internal Username" => "Interner Benutzername",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 587e59695c..8bd4429338 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -44,11 +44,11 @@
"months ago" => "شهر مضى",
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Ok" => "مواÙÙ‚",
-"Cancel" => "الغاء",
"Choose" => "اختيار",
+"Cancel" => "الغاء",
"Yes" => "نعم",
"No" => "لا",
+"Ok" => "مواÙÙ‚",
"The object type is not specified." => "نوع العنصر غير Ù…Øدد.",
"Error" => "خطأ",
"The app name is not specified." => "اسم التطبيق غير Ù…Øدد.",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 74e28bf290..6c04907e15 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -28,10 +28,10 @@
"last month" => "поÑледниÑÑ‚ меÑец",
"last year" => "поÑледната година",
"years ago" => "поÑледните години",
-"Ok" => "Добре",
"Cancel" => "Отказ",
"Yes" => "Да",
"No" => "Ðе",
+"Ok" => "Добре",
"Error" => "Грешка",
"Share" => "СподелÑне",
"Share with" => "Споделено Ñ",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 63a80edad3..218bbce04a 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -43,11 +43,11 @@
"months ago" => "মাস পূরà§à¦¬à§‡",
"last year" => "গত বছর",
"years ago" => "বছর পূরà§à¦¬à§‡",
-"Ok" => "তথাসà§à¦¤à§",
-"Cancel" => "বাতির",
"Choose" => "বেছে নিন",
+"Cancel" => "বাতির",
"Yes" => "হà§à¦¯à¦¾à¦",
"No" => "না",
+"Ok" => "তথাসà§à¦¤à§",
"The object type is not specified." => "অবজেকà§à¦Ÿà§‡à¦° ধরণটি সà§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ নয়।",
"Error" => "সমসà§à¦¯à¦¾",
"The app name is not specified." => "অà§à¦¯à¦¾à¦ªà§‡à¦° নামটি সà§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ নয়।",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index a1430d547f..6a5a6ea542 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -44,11 +44,11 @@
"months ago" => "mesos enrere",
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Ok" => "D'acord",
-"Cancel" => "Cancel·la",
"Choose" => "Escull",
+"Cancel" => "Cancel·la",
"Yes" => "SÃ",
"No" => "No",
+"Ok" => "D'acord",
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index be354386e1..06cf7c214b 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -44,11 +44,11 @@
"months ago" => "pÅ™ed mÄ›sÃci",
"last year" => "minulý rok",
"years ago" => "před lety",
-"Ok" => "Ok",
-"Cancel" => "Zrušit",
"Choose" => "Vybrat",
+"Cancel" => "Zrušit",
"Yes" => "Ano",
"No" => "Ne",
+"Ok" => "Ok",
"The object type is not specified." => "Nenà urÄen typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nenà urÄen název aplikace.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index a874d43965..cdb2576d45 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -44,11 +44,11 @@
"months ago" => "misoedd yn ôl",
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
-"Ok" => "Iawn",
-"Cancel" => "Diddymu",
"Choose" => "Dewisiwch",
+"Cancel" => "Diddymu",
"Yes" => "Ie",
"No" => "Na",
+"Ok" => "Iawn",
"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
"Error" => "Gwall",
"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 43b2f4f840..4e9f742e80 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -44,11 +44,11 @@
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "Ã¥r siden",
-"Ok" => "OK",
-"Cancel" => "Annuller",
"Choose" => "Vælg",
+"Cancel" => "Annuller",
"Yes" => "Ja",
"No" => "Nej",
+"Ok" => "OK",
"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
"The app name is not specified." => "Den app navn er ikke angivet.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index b53bda109d..62e9925b94 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Ok" => "OK",
-"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
"Yes" => "Ja",
"No" => "Nein",
+"Ok" => "OK",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 7e9b64193c..f395c192bd 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Ok" => "OK",
-"Cancel" => "Abbrechen",
"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
"Yes" => "Ja",
"No" => "Nein",
+"Ok" => "OK",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index dbe0d0ee3d..11295105e3 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -44,11 +44,11 @@
"months ago" => "μήνες Ï€Ïιν",
"last year" => "τελευταίο χÏόνο",
"years ago" => "χÏόνια Ï€Ïιν",
-"Ok" => "Οκ",
-"Cancel" => "ΆκυÏο",
"Choose" => "ΕπιλÎξτε",
+"Cancel" => "ΆκυÏο",
"Yes" => "Îαι",
"No" => "Όχι",
+"Ok" => "Οκ",
"The object type is not specified." => "Δεν καθοÏίστηκε ο Ï„Ïπος του αντικειμÎνου.",
"Error" => "Σφάλμα",
"The app name is not specified." => "Δεν καθοÏίστηκε το όνομα της εφαÏμογής.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 1889de1ea2..72cdf90c61 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -43,11 +43,11 @@
"months ago" => "monatoj antaÅe",
"last year" => "lastajare",
"years ago" => "jaroj antaÅe",
-"Ok" => "Akcepti",
-"Cancel" => "Nuligi",
"Choose" => "Elekti",
+"Cancel" => "Nuligi",
"Yes" => "Jes",
"No" => "Ne",
+"Ok" => "Akcepti",
"The object type is not specified." => "Ne indikiÄis tipo de la objekto.",
"Error" => "Eraro",
"The app name is not specified." => "Ne indikiÄis nomo de la aplikaĵo.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index d99ac861ce..2d9adb15cc 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -44,11 +44,11 @@
"months ago" => "hace meses",
"last year" => "el año pasado",
"years ago" => "hace años",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Seleccionar",
+"Cancel" => "Cancelar",
"Yes" => "SÃ",
"No" => "No",
+"Ok" => "Aceptar",
"The object type is not specified." => "No se ha especificado el tipo de objeto",
"Error" => "Error",
"The app name is not specified." => "No se ha especificado el nombre de la aplicación.",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 8f77843708..38b0791b94 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Elegir",
+"Cancel" => "Cancelar",
"Yes" => "SÃ",
"No" => "No",
+"Ok" => "Aceptar",
"The object type is not specified." => "El tipo de objeto no esta especificado. ",
"Error" => "Error",
"The app name is not specified." => "El nombre de la aplicación no esta especificado.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 79d3024f01..d298b74fc0 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -44,11 +44,11 @@
"months ago" => "kuu tagasi",
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
-"Ok" => "Ok",
-"Cancel" => "Loobu",
"Choose" => "Vali",
+"Cancel" => "Loobu",
"Yes" => "Jah",
"No" => "Ei",
+"Ok" => "Ok",
"The object type is not specified." => "Objekti tüüp pole määratletud.",
"Error" => "Viga",
"The app name is not specified." => "Rakenduse nimi ole määratletud",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 9c9d28133c..1ec4ee8f5c 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -44,11 +44,11 @@
"months ago" => "hilabete",
"last year" => "joan den urtean",
"years ago" => "urte",
-"Ok" => "Ados",
-"Cancel" => "Ezeztatu",
"Choose" => "Aukeratu",
+"Cancel" => "Ezeztatu",
"Yes" => "Bai",
"No" => "Ez",
+"Ok" => "Ados",
"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
"Error" => "Errorea",
"The app name is not specified." => "App izena ez dago zehaztuta.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ff73e80448..fb8a312587 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -44,11 +44,11 @@
"months ago" => "ماه‌های قبل",
"last year" => "سال قبل",
"years ago" => "سال‌های قبل",
-"Ok" => "قبول",
-"Cancel" => "منصر٠شدن",
"Choose" => "انتخاب کردن",
+"Cancel" => "منصر٠شدن",
"Yes" => "بله",
"No" => "نه",
+"Ok" => "قبول",
"The object type is not specified." => "نوع شی تعیین نشده است.",
"Error" => "خطا",
"The app name is not specified." => "نام برنامه تعیین نشده است.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3f50e81484..1f7a01e0e0 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -42,11 +42,11 @@
"months ago" => "kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Ok" => "Ok",
-"Cancel" => "Peru",
"Choose" => "Valitse",
+"Cancel" => "Peru",
"Yes" => "Kyllä",
"No" => "Ei",
+"Ok" => "Ok",
"Error" => "Virhe",
"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
@@ -84,6 +84,7 @@
"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
"Username" => "Käyttäjätunnus",
"Request reset" => "Tilaus lähetetty",
@@ -118,6 +119,7 @@
"Database host" => "Tietokantapalvelin",
"Finish setup" => "Viimeistele asennus",
"web services under your control" => "verkkopalvelut hallinnassasi",
+"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
"Log out" => "Kirjaudu ulos",
"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 84ea35abcf..b01625a887 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -44,11 +44,11 @@
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Ok" => "Ok",
-"Cancel" => "Annuler",
"Choose" => "Choisir",
+"Cancel" => "Annuler",
"Yes" => "Oui",
"No" => "Non",
+"Ok" => "Ok",
"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
"Error" => "Erreur",
"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 7269e79274..3e05f7ec3f 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Ok" => "Aceptar",
-"Cancel" => "Cancelar",
"Choose" => "Escoller",
+"Cancel" => "Cancelar",
"Yes" => "Si",
"No" => "Non",
+"Ok" => "Aceptar",
"The object type is not specified." => "Non se especificou o tipo de obxecto.",
"Error" => "Erro",
"The app name is not specified." => "Non se especificou o nome do aplicativo.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 2560336074..eb2c3f3d15 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -44,11 +44,11 @@
"months ago" => "חודשי×",
"last year" => "×©× ×” שעברה",
"years ago" => "×©× ×™×",
-"Ok" => "בסדר",
-"Cancel" => "ביטול",
"Choose" => "בחירה",
+"Cancel" => "ביטול",
"Yes" => "כן",
"No" => "ל×",
+"Ok" => "בסדר",
"The object type is not specified." => "סוג הפריט ×œ× ×¦×•×™×Ÿ.",
"Error" => "שגי××”",
"The app name is not specified." => "×©× ×”×™×™×©×•× ×œ× ×¦×•×™×Ÿ.",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index e79e71d4b2..660b47c54f 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -28,11 +28,11 @@
"months ago" => "mjeseci",
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Ok" => "U redu",
-"Cancel" => "Odustani",
"Choose" => "Izaberi",
+"Cancel" => "Odustani",
"Yes" => "Da",
"No" => "Ne",
+"Ok" => "U redu",
"Error" => "Greška",
"Share" => "Podijeli",
"Error while sharing" => "Greška prilikom djeljenja",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 4c44404fbc..6b477746f2 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -44,11 +44,11 @@
"months ago" => "több hónapja",
"last year" => "tavaly",
"years ago" => "több éve",
-"Ok" => "Ok",
-"Cancel" => "Mégsem",
"Choose" => "Válasszon",
+"Cancel" => "Mégsem",
"Yes" => "Igen",
"No" => "Nem",
+"Ok" => "Ok",
"The object type is not specified." => "Az objektum tÃpusa nincs megadva.",
"Error" => "Hiba",
"The app name is not specified." => "Az alkalmazás neve nincs megadva.",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 984822af1e..065a4f2e72 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -44,11 +44,11 @@
"months ago" => "beberapa bulan lalu",
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
-"Ok" => "Oke",
-"Cancel" => "Batal",
"Choose" => "Pilih",
+"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
+"Ok" => "Oke",
"The object type is not specified." => "Tipe objek tidak ditentukan.",
"Error" => "Galat",
"The app name is not specified." => "Nama aplikasi tidak ditentukan.",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index d30d8bca11..bd8b58b290 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -43,11 +43,11 @@
"months ago" => "mánuðir sÃðan",
"last year" => "sÃðasta ári",
"years ago" => "einhverjum árum",
-"Ok" => "Ã lagi",
-"Cancel" => "Hætta við",
"Choose" => "Veldu",
+"Cancel" => "Hætta við",
"Yes" => "Já",
"No" => "Nei",
+"Ok" => "Ã lagi",
"The object type is not specified." => "Tegund ekki tilgreind",
"Error" => "Villa",
"The app name is not specified." => "Nafn forrits ekki tilgreint",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 15fba6ec7d..ce8f641129 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -44,11 +44,12 @@
"months ago" => "mesi fa",
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Ok" => "Ok",
-"Cancel" => "Annulla",
"Choose" => "Scegli",
+"Cancel" => "Annulla",
+"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
"Yes" => "Sì",
"No" => "No",
+"Ok" => "Ok",
"The object type is not specified." => "Il tipo di oggetto non è specificato.",
"Error" => "Errore",
"The app name is not specified." => "Il nome dell'applicazione non è specificato.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 783fe288ba..5f25445080 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -44,11 +44,11 @@
"months ago" => "月å‰",
"last year" => "一年å‰",
"years ago" => "å¹´å‰",
-"Ok" => "OK",
-"Cancel" => "ã‚ャンセル",
"Choose" => "é¸æŠž",
+"Cancel" => "ã‚ャンセル",
"Yes" => "ã¯ã„",
"No" => "ã„ã„ãˆ",
+"Ok" => "OK",
"The object type is not specified." => "オブジェクタイプãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"Error" => "エラー",
"The app name is not specified." => "アプリåãŒã—ã¦ã„ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index fd2e512654..b474548eae 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -44,11 +44,11 @@
"months ago" => "თვის წინ",
"last year" => "ბáƒáƒšáƒ წელს",
"years ago" => "წლის წინ",
-"Ok" => "დიáƒáƒ®",
-"Cancel" => "უáƒáƒ ყáƒáƒ¤áƒ",
"Choose" => "áƒáƒ ჩევáƒ",
+"Cancel" => "უáƒáƒ ყáƒáƒ¤áƒ",
"Yes" => "კი",
"No" => "áƒáƒ áƒ",
+"Ok" => "დიáƒáƒ®",
"The object type is not specified." => "áƒáƒ‘იექტის ტიპი áƒáƒ áƒáƒ ის მითითებული.",
"Error" => "შეცდáƒáƒ›áƒ",
"The app name is not specified." => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ სáƒáƒ®áƒ”ლი áƒáƒ áƒáƒ ის მითითებული.",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 08713edaee..6b97d672cf 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -44,11 +44,11 @@
"months ago" => "개월 ì „",
"last year" => "ìž‘ë…„",
"years ago" => "ë…„ ì „",
-"Ok" => "승ë½",
-"Cancel" => "취소",
"Choose" => "ì„ íƒ",
+"Cancel" => "취소",
"Yes" => "예",
"No" => "아니요",
+"Ok" => "승ë½",
"The object type is not specified." => "ê°ì²´ ìœ í˜•ì´ ì§€ì •ë˜ì§€ 않았습니다.",
"Error" => "오류",
"The app name is not specified." => "앱 ì´ë¦„ì´ ì§€ì •ë˜ì§€ 않았습니다.",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index f2277445f9..4c312df661 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -28,11 +28,11 @@
"months ago" => "Méint hier",
"last year" => "Läscht Joer",
"years ago" => "Joren hier",
-"Ok" => "OK",
-"Cancel" => "Ofbriechen",
"Choose" => "Auswielen",
+"Cancel" => "Ofbriechen",
"Yes" => "Jo",
"No" => "Nee",
+"Ok" => "OK",
"Error" => "Fehler",
"Share" => "Deelen",
"Password" => "Passwuert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 85b76fe694..1cd400117c 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -33,11 +33,11 @@
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
-"Ok" => "Gerai",
-"Cancel" => "Atšaukti",
"Choose" => "Pasirinkite",
+"Cancel" => "Atšaukti",
"Yes" => "Taip",
"No" => "Ne",
+"Ok" => "Gerai",
"Error" => "Klaida",
"Share" => "Dalintis",
"Error while sharing" => "Klaida, dalijimosi metu",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 18af82e4e3..e3d668d018 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -44,11 +44,11 @@
"months ago" => "mēnešus atpakaļ",
"last year" => "gÄjuÅ¡ajÄ gadÄ",
"years ago" => "gadus atpakaļ",
-"Ok" => "Labi",
-"Cancel" => "Atcelt",
"Choose" => "Izvēlieties",
+"Cancel" => "Atcelt",
"Yes" => "JÄ",
"No" => "NÄ“",
+"Ok" => "Labi",
"The object type is not specified." => "Nav norÄdÄ«ts objekta tips.",
"Error" => "Kļūda",
"The app name is not specified." => "Nav norÄdÄ«ts lietotnes nosaukums.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index a6c06e4780..b0c39debb8 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -43,11 +43,11 @@
"months ago" => "пред меÑеци",
"last year" => "минатата година",
"years ago" => "пред години",
-"Ok" => "Во ред",
-"Cancel" => "Откажи",
"Choose" => "Избери",
+"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Ðе",
+"Ok" => "Во ред",
"The object type is not specified." => "Ðе е Ñпецифициран типот на објект.",
"Error" => "Грешка",
"The app name is not specified." => "Името на апликацијата не е Ñпецифицирано.",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 70581ff769..e7dc73a32c 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -21,10 +21,10 @@
"November" => "November",
"December" => "Disember",
"Settings" => "Tetapan",
-"Ok" => "Ok",
"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
+"Ok" => "Ok",
"Error" => "Ralat",
"Share" => "Kongsi",
"Password" => "Kata laluan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index ef8be954ed..6ea6a2c7bb 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -21,11 +21,11 @@
"last month" => "ပြီးá€á€²á€·á€žá€±á€¬á€œ",
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Ok" => "အá€á€¯á€€á€±",
-"Cancel" => "ပယ်ဖျက်မည်",
"Choose" => "ရွေးá€á€»á€šá€º",
+"Cancel" => "ပယ်ဖျက်မည်",
"Yes" => "ဟုá€á€º",
"No" => "မဟုá€á€ºá€˜á€°á€¸",
+"Ok" => "အá€á€¯á€€á€±",
"Password" => "စကားá€á€¾á€€á€º",
"Set expiration date" => "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်သá€á€ºá€™á€¾á€á€ºá€™á€Šá€º",
"Expiration date" => "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 6efb31a7de..30d3f91df2 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -34,11 +34,11 @@
"months ago" => "måneder siden",
"last year" => "forrige år",
"years ago" => "Ã¥r siden",
-"Ok" => "Ok",
-"Cancel" => "Avbryt",
"Choose" => "Velg",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
+"Ok" => "Ok",
"Error" => "Feil",
"Share" => "Del",
"Error while sharing" => "Feil under deling",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 7e823b2e61..a39f34fb90 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -44,11 +44,11 @@
"months ago" => "maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Ok" => "Ok",
-"Cancel" => "Annuleer",
"Choose" => "Kies",
+"Cancel" => "Annuleer",
"Yes" => "Ja",
"No" => "Nee",
+"Ok" => "Ok",
"The object type is not specified." => "Het object type is niet gespecificeerd.",
"Error" => "Fout",
"The app name is not specified." => "De app naam is niet gespecificeerd.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index d11ff92fa8..de181ccc7a 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -44,11 +44,11 @@
"months ago" => "månadar sidan",
"last year" => "i fjor",
"years ago" => "Ã¥r sidan",
-"Ok" => "Greitt",
-"Cancel" => "Avbryt",
"Choose" => "Vel",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
+"Ok" => "Greitt",
"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
"Error" => "Feil",
"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index a384b0315b..1d14428f18 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -29,11 +29,11 @@
"months ago" => "meses a",
"last year" => "an passat",
"years ago" => "ans a",
-"Ok" => "D'accòrdi",
-"Cancel" => "Annula",
"Choose" => "CausÃs",
+"Cancel" => "Annula",
"Yes" => "Ã’c",
"No" => "Non",
+"Ok" => "D'accòrdi",
"Error" => "Error",
"Share" => "Parteja",
"Error while sharing" => "Error al partejar",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 37d01abf84..335dda6f4d 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -44,11 +44,11 @@
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Ok" => "OK",
-"Cancel" => "Anuluj",
"Choose" => "Wybierz",
+"Cancel" => "Anuluj",
"Yes" => "Tak",
"No" => "Nie",
+"Ok" => "OK",
"The object type is not specified." => "Nie określono typu obiektu.",
"Error" => "BÅ‚Ä…d",
"The app name is not specified." => "Nie określono nazwy aplikacji.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index b52a9bb508..9ce255980c 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Ok" => "Ok",
-"Cancel" => "Cancelar",
"Choose" => "Escolha",
+"Cancel" => "Cancelar",
"Yes" => "Sim",
"No" => "Não",
+"Ok" => "Ok",
"The object type is not specified." => "O tipo de objeto não foi especificado.",
"Error" => "Erro",
"The app name is not specified." => "O nome do app não foi especificado.",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 1084fc618f..0b2f511cb8 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Ok" => "Ok",
-"Cancel" => "Cancelar",
"Choose" => "Escolha",
+"Cancel" => "Cancelar",
"Yes" => "Sim",
"No" => "Não",
+"Ok" => "Ok",
"The object type is not specified." => "O tipo de objecto não foi especificado",
"Error" => "Erro",
"The app name is not specified." => "O nome da aplicação não foi especificado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 36ee8ab4b6..3d25a5f042 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -44,11 +44,11 @@
"months ago" => "luni în urmă",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Ok" => "Ok",
-"Cancel" => "Anulare",
"Choose" => "Alege",
+"Cancel" => "Anulare",
"Yes" => "Da",
"No" => "Nu",
+"Ok" => "Ok",
"The object type is not specified." => "Tipul obiectului nu a fost specificat",
"Error" => "Eroare",
"The app name is not specified." => "Numele aplicației nu a fost specificat",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 43dd398119..781eb1bbfa 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -44,11 +44,11 @@
"months ago" => "неÑколько меÑÑцев назад",
"last year" => "в прошлом году",
"years ago" => "неÑколько лет назад",
-"Ok" => "Ок",
-"Cancel" => "Отменить",
"Choose" => "Выбрать",
+"Cancel" => "Отменить",
"Yes" => "Да",
"No" => "Ðет",
+"Ok" => "Ок",
"The object type is not specified." => "Тип объекта не указан",
"Error" => "Ошибка",
"The app name is not specified." => "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ указано",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index d43ee8cf54..580df5961f 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,4 +1,7 @@
<?php $TRANSLATIONS = array(
"Settings" => "ÐаÑтройки",
-"Error" => "Ошибка"
+"Cancel" => "Отмена",
+"Error" => "Ошибка",
+"Share" => "Сделать общим",
+"Add" => "Добавить"
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index c1e8ba37ed..be7c1a24aa 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -28,11 +28,11 @@
"months ago" => "මà·à·ƒ කීපයකට පෙර",
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Ok" => "හරි",
-"Cancel" => "එපà·",
"Choose" => "à¶à·à¶»à¶±à·Šà¶±",
+"Cancel" => "එපà·",
"Yes" => "ඔව්",
"No" => "එපà·",
+"Ok" => "හරි",
"Error" => "දà·à·‚යක්",
"Share" => "බෙද෠හද෠ගන්න",
"Share with" => "බෙදà·à¶œà¶±à·Šà¶±",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 6a2d0aa5ec..2dfaa01b5a 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -44,11 +44,11 @@
"months ago" => "pred mesiacmi",
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Ok" => "Ok",
-"Cancel" => "Zrušiť",
"Choose" => "Výber",
+"Cancel" => "Zrušiť",
"Yes" => "Ãno",
"No" => "Nie",
+"Ok" => "Ok",
"The object type is not specified." => "Nešpecifikovaný typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nešpecifikované meno aplikácie.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2854807130..a433aa2cc4 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -44,11 +44,11 @@
"months ago" => "mesecev nazaj",
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Ok" => "V redu",
-"Cancel" => "PrekliÄi",
"Choose" => "Izbor",
+"Cancel" => "PrekliÄi",
"Yes" => "Da",
"No" => "Ne",
+"Ok" => "V redu",
"The object type is not specified." => "Vrsta predmeta ni podana.",
"Error" => "Napaka",
"The app name is not specified." => "Ime programa ni podano.",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 8769a833e1..40562add93 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -44,11 +44,11 @@
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Ok" => "Në rregull",
-"Cancel" => "Anulo",
"Choose" => "Zgjidh",
+"Cancel" => "Anulo",
"Yes" => "Po",
"No" => "Jo",
+"Ok" => "Në rregull",
"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
"Error" => "Veprim i gabuar",
"The app name is not specified." => "Nuk është specifikuar emri i app-it.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 2329dc49b1..49664f19f3 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -41,11 +41,11 @@
"months ago" => "меÑеци раније",
"last year" => "прошле године",
"years ago" => "година раније",
-"Ok" => "У реду",
-"Cancel" => "Откажи",
"Choose" => "Одабери",
+"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Ðе",
+"Ok" => "У реду",
"The object type is not specified." => "Ð’Ñ€Ñта објекта није подешена.",
"Error" => "Грешка",
"The app name is not specified." => "Име програма није унето.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 26bcebdf6c..d4154678b6 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -44,11 +44,11 @@
"months ago" => "månader sedan",
"last year" => "förra året",
"years ago" => "Ã¥r sedan",
-"Ok" => "Ok",
-"Cancel" => "Avbryt",
"Choose" => "Välj",
+"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nej",
+"Ok" => "Ok",
"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
"The app name is not specified." => " Namnet på appen är inte specificerad.",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index b01f8df945..b67f5e967e 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -39,11 +39,11 @@
"months ago" => "மாதஙà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
"last year" => "கடநà¯à®¤ வரà¯à®Ÿà®®à¯",
"years ago" => "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
-"Ok" => "சரி",
-"Cancel" => "இரதà¯à®¤à¯ செயà¯à®•",
"Choose" => "தெரிவà¯à®šà¯†à®¯à¯à®• ",
+"Cancel" => "இரதà¯à®¤à¯ செயà¯à®•",
"Yes" => "ஆமà¯",
"No" => "இலà¯à®²à¯ˆ",
+"Ok" => "சரி",
"The object type is not specified." => "பொரà¯à®³à¯ வகை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
"Error" => "வழà¯",
"The app name is not specified." => "செயலி பெயர௠கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 040ab9b550..1469d37296 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -33,10 +33,10 @@
"months ago" => "నెలల à°•à±à°°à°¿à°¤à°‚",
"last year" => "పోయిన సంవతà±à°¸à°°à°‚",
"years ago" => "సంవతà±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚",
-"Ok" => "సరే",
"Cancel" => "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿",
"Yes" => "à°…à°µà±à°¨à±",
"No" => "కాదà±",
+"Ok" => "సరే",
"Error" => "పొరపాటà±",
"Password" => "సంకేతపదం",
"Send" => "పంపించà±",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 1114726434..66f5629b93 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -43,11 +43,11 @@
"months ago" => "เดืà¸à¸™ ที่ผ่านมา",
"last year" => "ปีที่à¹à¸¥à¹‰à¸§",
"years ago" => "ปี ที่ผ่านมา",
-"Ok" => "ตà¸à¸¥à¸‡",
-"Cancel" => "ยà¸à¹€à¸¥à¸´à¸",
"Choose" => "เลืà¸à¸",
+"Cancel" => "ยà¸à¹€à¸¥à¸´à¸",
"Yes" => "ตà¸à¸¥à¸‡",
"No" => "ไม่ตà¸à¸¥à¸‡",
+"Ok" => "ตà¸à¸¥à¸‡",
"The object type is not specified." => "ชนิดขà¸à¸‡à¸§à¸±à¸•à¸–ุยังไม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸",
"Error" => "ข้à¸à¸œà¸´à¸”พลาด",
"The app name is not specified." => "ชื่à¸à¸‚à¸à¸‡à¹à¸à¸›à¸¢à¸±à¸‡à¹„ม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸à¸Šà¸·à¹ˆà¸",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 29a6e7a286..47574a0125 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -44,11 +44,11 @@
"months ago" => "ay önce",
"last year" => "geçen yıl",
"years ago" => "yıl önce",
-"Ok" => "Tamam",
-"Cancel" => "Ä°ptal",
"Choose" => "seç",
+"Cancel" => "Ä°ptal",
"Yes" => "Evet",
"No" => "Hayır",
+"Ok" => "Tamam",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
"The app name is not specified." => "uygulama adı belirtilmedi.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 4727e37deb..c1bf48e07d 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -23,10 +23,10 @@
"1 hour ago" => "1 سائەت ئىلگىرى",
"today" => "بۈگۈن",
"yesterday" => "تۈنۈگۈن",
-"Ok" => "جەزملە",
"Cancel" => "ۋاز كەچ",
"Yes" => "ھەئە",
"No" => "ياق",
+"Ok" => "جەزملە",
"Error" => "خاتالىق",
"Share" => "ھەمبەھىر",
"Share with" => "ھەمبەھىر",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index a9e4117a61..65577297c3 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -44,11 +44,11 @@
"months ago" => "міÑÑці тому",
"last year" => "минулого року",
"years ago" => "роки тому",
-"Ok" => "Ok",
-"Cancel" => "Відмінити",
"Choose" => "Обрати",
+"Cancel" => "Відмінити",
"Yes" => "Так",
"No" => "ÐÑ–",
+"Ok" => "Ok",
"The object type is not specified." => "Ðе визначено тип об'єкту.",
"Error" => "Помилка",
"The app name is not specified." => "Ðе визначено ім'Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸.",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 544d041e48..cf26212c25 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -14,11 +14,11 @@
"November" => "نومبر",
"December" => "دسمبر",
"Settings" => "سیٹینگز",
-"Ok" => "اوکے",
-"Cancel" => "منسوخ کریں",
"Choose" => "منتخب کریں",
+"Cancel" => "منسوخ کریں",
"Yes" => "Ûاں",
"No" => "Ù†Ûیں",
+"Ok" => "اوکے",
"Error" => "ایرر",
"Error while sharing" => "شئیرنگ کے دوران ایرر",
"Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 31c4a37545..3e320ecf80 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -44,11 +44,11 @@
"months ago" => "tháng trước",
"last year" => "năm trước",
"years ago" => "năm trước",
-"Ok" => "Äồng ý",
-"Cancel" => "Hủy",
"Choose" => "Chá»n",
+"Cancel" => "Hủy",
"Yes" => "Có",
"No" => "Không",
+"Ok" => "Äồng ý",
"The object type is not specified." => "Loại đối tượng không được chỉ định.",
"Error" => "Lá»—i",
"The app name is not specified." => "Tên ứng dụng không được chỉ định.",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 7e98d69b64..2e0d0da6f2 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -41,11 +41,11 @@
"months ago" => "月å‰",
"last year" => "去年",
"years ago" => "å¹´å‰",
-"Ok" => "好的",
-"Cancel" => "å–消",
"Choose" => "选择",
+"Cancel" => "å–消",
"Yes" => "是",
"No" => "å¦",
+"Ok" => "好的",
"The object type is not specified." => "未指定对象类型。",
"Error" => "出错",
"The app name is not specified." => "未指定应用å称。",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index c37f7b2602..59dd4d2b86 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -44,11 +44,11 @@
"months ago" => "月å‰",
"last year" => "去年",
"years ago" => "å¹´å‰",
-"Ok" => "好",
-"Cancel" => "å–消",
"Choose" => "选择(&C)...",
+"Cancel" => "å–消",
"Yes" => "是",
"No" => "å¦",
+"Ok" => "好",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定Appå称。",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index c4f4009517..21418fe2ee 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -23,10 +23,10 @@
"yesterday" => "昨日",
"last month" => "å‰ä¸€æœˆ",
"months ago" => "個月之å‰",
-"Ok" => "OK",
"Cancel" => "å–消",
"Yes" => "Yes",
"No" => "No",
+"Ok" => "OK",
"Error" => "錯誤",
"Shared" => "已分享",
"Share" => "分享",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 6537e6dff0..4de9123032 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -44,11 +44,11 @@
"months ago" => "幾個月å‰",
"last year" => "去年",
"years ago" => "幾年å‰",
-"Ok" => "好",
-"Cancel" => "å–消",
"Choose" => "é¸æ“‡",
+"Cancel" => "å–消",
"Yes" => "是",
"No" => "å¦",
+"Ok" => "好",
"The object type is not specified." => "未指定物件類型。",
"Error" => "錯誤",
"The app name is not specified." => "沒有指定 app å稱。",
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 75c2b8c54c..7474a030a0 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index cd9b771d47..007aa81cc8 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hulp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persoonlik"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Instellings"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Gebruikers"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Toepassings"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 06a5795244..c1ec6581da 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "السنةالماضية"
msgid "years ago"
msgstr "سنة مضت"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "مواÙÙ‚"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "اختيار"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "الغاء"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "اختيار"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "لا"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 0136882b87..dd86ceb4bc 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 6ba8fd6540..bbe335948c 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 58288103c1..369e400f5f 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index de67c217d3..97578e2ef9 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index c05edd40e0..07c5b6fd22 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "المساعدة"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "شخصي"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "إعدادات"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "المستخدمين"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "التطبيقات"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "المدير"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "تØميل ملÙات ZIP متوقÙ"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "الملÙات بØاجة الى ان يتم تØميلها واØد تلو الاخر"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "العودة الى الملÙات"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "الملÙات المØددة كبيرة جدا ليتم ضغطها ÙÙŠ مل٠zip"
@@ -113,72 +113,76 @@ msgstr "%s لا ÙŠØ³Ù…Ø Ù„Ùƒ باستخدام نقطه (.) ÙÙŠ اسم قاعد
msgid "%s set the database host."
msgstr "%s ادخل اسم خادم قاعدة البيانات"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صØÙŠØØ©"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "انت بØاجة لكتابة اسم مستخدم موجود أو Øساب المدير."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام Oracle غير صØÙŠØ"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام MySQL غير صØÙŠØ"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "خطأ ÙÙŠ قواعد البيانات : \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "الأمر المخال٠كان : \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "أسم المستخدم '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "اØذ٠اسم المستخدم هذا من الـ MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "أسم المستخدم '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "اØذ٠اسم المستخدم هذا من الـ MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام Oracle غير صØÙŠØ"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "الأمر المخال٠كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "اسم المستخدم Ùˆ/أو كلمة المرور لنظام MS SQL غير صØÙŠØ : %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اعدادات خادمك غير صØÙŠØØ© بشكل ØªØ³Ù…Ø Ù„Ùƒ بمزامنة ملÙاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "الرجاء التØقق من <a href='%s'>دليل التنصيب</a>."
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index e0f912c9ba..de2dc8b777 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 459d3c4da5..9674f31fb6 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 7d6092b5f4..e2a9f071ad 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "поÑледната година"
msgid "years ago"
msgstr "поÑледните години"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Добре"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Отказ"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ðе"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 160de033ba..2dbb38e8b9 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 8c95fe66a3..00fc8947a1 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 156d054e77..7c4ce74f7a 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 76a4f6c926..4784eccbdd 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 5ba599532f..9926586c63 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помощ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Лични"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ÐаÑтройки"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Потребители"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ПриложениÑ"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Ðдмин"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ИзтеглÑнето като ZIP е изключено."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Файловете Ñ‚Ñ€Ñбва да Ñе изтеглÑÑ‚ един по един."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Ðазад към файловете"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Избраните файлове Ñа прекалено големи за генерирането на ZIP архив."
@@ -113,72 +113,76 @@ msgstr "%s, не можете да ползвате точки в името н
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Ðевалидно PostgreSQL потребителÑко име и/или парола"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Ðеобходимо е да влезете в вÑъщеÑтвуващ акаунт или като админиÑтратора"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Ðевалидно Oracle потребителÑко име и/или парола"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Ðевалидно MySQL потребителÑко име и/или парола"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Грешка в базата от данни: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL потребителÑÑ‚ '%s'@'localhost' вече ÑъщеÑтвува"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Изтриване на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL потребителÑÑ‚ '%s'@'%%' вече ÑъщеÑтвува."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Изтриване на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Ðевалидно Oracle потребителÑко име и/или парола"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Ðевалидно MS SQL потребителÑко име и/или парола: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ повторна Ñправка Ñ <a href='%s'>ръководÑтвото за инÑталиране</a>."
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e6d0abbf85..4a48feafd4 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 0859379edb..523a9f3f6b 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index ffb1faa6bd..04357e7be9 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "গত বছর"
msgid "years ago"
msgstr "বছর পূরà§à¦¬à§‡"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "তথাসà§à¦¤à§"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "বেছে নিন"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "বাতির"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "বেছে নিন"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "হà§à¦¯à¦¾à¦"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "না"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 25a098953c..ef080f3a2c 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 910f1b7be0..756e68e648 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 32181f41e1..1125bc4119 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 01a1615790..941d663b7b 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 6ba334e04d..c0026153b0 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "সহায়িকা"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "বà§à¦¯à¦•à§à¦¤à¦¿à¦—ত"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "অà§à¦¯à¦¾à¦ª"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "পà§à¦°à¦¶à¦¾à¦¸à¦¨"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP ডাউনলোড বনà§à¦§ করা আছে।"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "ফাইলগà§à¦²à§‹ à¦à¦•à§‡ à¦à¦•à§‡ ডাউনলোড করা আবশà§à¦¯à¦•à¥¤"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "ফাইলে ফিরে চল"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফাইলগà§à¦²à§‹ à¦à¦¤à¦‡ বৃহৎ যে জিপ ফাইল তৈরী করা সমà§à¦à¦¬ নয়।"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index e0081ad76a..69adcbebf6 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 470c3d630b..95e7905df4 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index fe0bd380da..f507c90fb8 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "l'any passat"
msgid "years ago"
msgstr "anys enrere"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "D'acord"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escull"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancel·la"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escull"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "D'acord"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index cf8af961c9..04981726ab 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index ae9bf2ab8a..8891a75a0e 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 21:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+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"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index d23fa03363..74044813bc 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index af988ccbae..42c6cf5a92 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 9225ebad50..0bacb709f9 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configuració"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuaris"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicacions"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administració"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "La baixada en ZIP està desactivada."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Els fitxers s'han de baixar d'un en un."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Torna a Fitxers"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
@@ -113,72 +113,76 @@ msgstr "%s no podeu usar punts en el nom de la base de dades"
msgid "%s set the database host."
msgstr "%s establiu l'ordinador central de la base de dades."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya PostgreSQL no và lids"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Heu d'escriure un compte existent o el d'administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nom d'usuari i/o contrasenya Oracle no và lids"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nom d'usuari i/o contrasenya MySQL no và lids"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "L'ordre en conflicte és: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Elimina aquest usuari de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Elimina aquest usuari de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nom d'usuari i/o contrasenya Oracle no và lids"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nom d'usuari i/o contrasenya MS SQL no và lids: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfÃcie WebDAV sembla no funcionar correctament."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 0d6054fa5b..1fdca4c9dc 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index b664c8a830..10f3f0166d 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 11:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 48fbe83a66..be3bbdc893 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "před lety"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vybrat"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Zrušit"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vybrat"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index f164d72836..7a36587eeb 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 62dc51cbd5..927cfd451c 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index b26c3b61d6..ce9e280736 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index ce5f4e645f..a7f3b6ea85 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index ae5d9d8705..ad1a269592 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Nápověda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "OsobnÃ"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "NastavenÃ"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Uživatelé"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikace"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrace"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Stahovánà ZIPu je vypnuto."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Soubory musà být stahovány jednotlivě."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Zpět k souborům"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Vybrané soubory jsou pÅ™ÃliÅ¡ velké pro vytvoÅ™enà zip souboru."
@@ -113,72 +113,76 @@ msgstr "V názvu databáze %s nesmÃte použÃvat teÄky."
msgid "%s set the database host."
msgstr "Zadejte název poÄÃtaÄe s databázà %s."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Uživatelské jméno, Äi heslo PostgreSQL nenà platné"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "MusÃte zadat existujÃcà úÄet, Äi správce."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Uživatelské jméno, Äi heslo Oracle nenà platné"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Uživatelské jméno, Äi heslo MySQL nenà platné"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Chyba DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "PodezÅ™elý pÅ™Ãkaz byl: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Zahodit uživatele z MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Zahodit uživatele z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Uživatelské jméno, Äi heslo Oracle nenà platné"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "PodezÅ™elý pÅ™Ãkaz byl: \"%s\", jméno: %s, heslo: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Uživatelské jméno, Äi heslo MSSQL nenà platné: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nenà správně nastaven pro umožněnà synchronizace, protože rozhranà WebDAV je rozbité."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Zkonzultujte, prosÃm, <a href='%s'>průvodce instalacÃ</a>."
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 9af35dfb21..64f7c79490 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 70baa024a0..60c1780300 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 2afb7a5ea8..7d0fc54707 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "y llynedd"
msgid "years ago"
msgstr "blwyddyn yn ôl"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Iawn"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Dewisiwch"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Diddymu"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Dewisiwch"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Na"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Iawn"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 32f11d2044..e6532a72d4 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 08d181aa3b..8eedfc37f7 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 8a848fc501..a7f0caca27 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 14:47+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index e1cc6bccb9..45e6ca9476 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index b0dbdfec6c..e29f1d19e6 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 14:46+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Cymorth"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personol"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Gosodiadau"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Defnyddwyr"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Pecynnau"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Gweinyddu"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Mae llwytho ZIP wedi ei ddiffodd."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Nôl i Ffeiliau"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
@@ -113,72 +113,76 @@ msgstr "%s does dim hawl defnyddio dot yn enw'r gronfa ddata"
msgid "%s set the database host."
msgstr "%s gosod gwesteiwr y gronfa ddata."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Enw a/neu gyfrinair Oracle annilys"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Enw a/neu gyfrinair MySQL annilys"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Gwall DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Gollwng y defnyddiwr hwn o MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Gollwng y defnyddiwr hwn o MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Enw a/neu gyfrinair Oracle annilys"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 3d0b6fb4d4..4680367639 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 193441f938..b8246f1cea 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index a7b1bd9925..3d81bf96c9 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "sidste år"
msgid "years ago"
msgstr "Ã¥r siden"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vælg"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annuller"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vælg"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nej"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 36c60585d2..57a44c5f98 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 85d11b63bf..3a75895703 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 39cc42941e..a51c29810a 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 05219a3d19..909dec96ad 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index ac8b6efab1..021991572a 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjælp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personligt"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Indstillinger"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Brugere"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP-download er slået fra."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Filer skal downloades en for en."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Tilbage til Filer"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "De markerede filer er for store til at generere en ZIP-fil."
@@ -113,72 +113,76 @@ msgstr "%s du må ikke bruge punktummer i databasenavnet."
msgid "%s set the database host."
msgstr "%s sæt database værten."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Databasefejl: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fejlende kommando var: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Slet denne bruger fra MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Slet denne bruger fra MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 0d668d9af3..1fc6fbb763 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 0d1223e965..9639ba3b5f 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index dbe7d0f5ad..4d051755e2 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -215,26 +215,30 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Auswählen"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Auswählen"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nein"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 2a33c07223..6c709fddd8 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index aaa2995382..762e9d3486 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:55+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 3b551c2031..5662022a29 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 19:50+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index fb1fdac414..ea4291698a 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 417ce173f3..6f60dd7fd8 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hilfe"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persönlich"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Benutzer"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administration"
@@ -114,72 +114,76 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
msgid "%s set the database host."
msgstr "%s setze den Datenbank-Host"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle Benutzername und/oder Passwort ungültig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL Benutzername und/oder Passwort ungültig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fehler: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fehlerhafter Befehl war: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Lösche diesen Benutzer von MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Lösche diesen Benutzer aus MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
-#: setup.php:858
+#: setup.php:867
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:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index d161a392cc..b84c87664b 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index be5f6d9eb1..1d0d538225 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index f6939d83e5..9a849c6a2b 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -216,26 +216,30 @@ msgstr "Letztes Jahr"
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Auswählen"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Auswählen"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nein"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 9dc6112859..9f2775390a 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 7646967a4f..95a49523f0 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 5a9782beeb..ecf16837b2 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 4cdafce673..7528aa33b1 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index bcbe6b91ad..802433b473 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-06 21:53+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hilfe"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persönlich"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Benutzer"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrator"
@@ -113,72 +113,76 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
msgid "%s set the database host."
msgstr "%s setze den Datenbank-Host"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
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."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle Benutzername und/oder Passwort ungültig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL Benutzername und/oder Passwort ungültig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fehler: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Fehlerhafter Befehl war: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Lösche diesen Benutzer aus MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Lösche diesen Benutzer aus MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
-#: setup.php:858
+#: setup.php:867
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 noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 860895432a..231673b043 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index c0780d51b8..7f49c8e8ea 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -5,13 +5,14 @@
# Translators:
# a.tangemann <a.tangemann@web.de>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-19 01:58+0200\n"
-"PO-Revision-Date: 2013-05-18 22:00+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -360,7 +361,7 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index adff3efe96..404b31bf2c 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Wasilis <m.wasilis@yahoo.de>, 2013
+# Wasilis <inactive+Wasilis@transifex.com>, 2013
# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "τελευταίο χÏόνο"
msgid "years ago"
msgstr "χÏόνια Ï€Ïιν"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Οκ"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "ΕπιλÎξτε"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ΆκυÏο"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "ΕπιλÎξτε"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Îαι"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Όχι"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 78423ef928..776ae2e521 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} αÏχεία"
#: lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Μη ÎγκυÏο όνομα φακÎλου. Η χÏήση του 'ΚοινόχÏηστος' χÏησιμοποιείται από το ownCloud"
#: lib/app.php:73
msgid "Unable to rename file"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 592955425a..cc6ffbfcf0 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 793338e63d..b963f18ed1 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index 05b9266f9e..09dfdf6d4a 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index aa1aed6797..66fdcec8a4 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Βοήθεια"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Î Ïοσωπικά"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ΧÏήστες"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ΕφαÏμογÎÏ‚"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ΔιαχειÏιστής"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Η λήψη ZIP απενεÏγοποιήθηκε."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Τα αÏχεία Ï€ÏÎπει να ληφθοÏν Îνα-Îνα."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Πίσω στα ΑÏχεία"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Τα επιλεγμÎνα αÏχεία είναι μεγάλα ώστε να δημιουÏγηθεί αÏχείο zip."
@@ -113,72 +113,76 @@ msgstr "%s μάλλον δεν χÏησιμοποιείτε τελείες στ
msgid "%s set the database host."
msgstr "%s Ïυθμίση του κεντÏικόυ υπολογιστή βάσης δεδομÎνων. "
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της PostgreSQL"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "ΧÏειάζεται να εισάγετε είτε Îναν υπάÏχον λογαÏιασμό ή του διαχειÏιστή."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της Oracle"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της MySQL"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Σφάλμα Βάσης ΔεδομÎνων: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Η εντολη παÏαβατικοτητας ηταν: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "ΥπάÏχει ήδη ο χÏήστης '%s'@'localhost' της MySQL."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "ΑπόÏÏιψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη από την MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Ο χÏήστης '%s'@'%%' της MySQL υπάÏχει ήδη"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "ΑπόÏÏιψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη από την MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της Oracle"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Η εντολη παÏαβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Το όνομα χÏήστη και/ή ο κωδικός της MS SQL δεν είναι ÎγκυÏα: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ο διακομιστής σας δεν Îχει Ïυθμιστεί κατάλληλα ώστε να επιτÏÎπει τον συγχÏονισμό αÏχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστÏαμμÎνη."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ΕλÎγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 9103a1e0fc..b5ee78199a 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 815d1c8291..39de6e98c6 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 754680e81f..c3f62f9571 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index b60b265114..c8e6a64b2e 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 04:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 3fc75e6110..0ed73ec376 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "lastajare"
msgid "years ago"
msgstr "jaroj antaÅe"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Akcepti"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Elekti"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Nuligi"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Elekti"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Akcepti"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index bc5988ea85..9e476a415a 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index ef0f0605dd..915ab9e130 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 4e6e0cbf14..c1815327db 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index edd0e86b30..e30b73af02 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index b88a2dd5e2..7b7db0ac13 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Helpo"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persona"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Agordo"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Uzantoj"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikaĵoj"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administranto"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP-elÅuto estas malkapabligita."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Dosieroj devas elÅutiÄi unuope."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Reen al la dosieroj"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 5103daa931..ea11dc41a8 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 2a5527f375..305aa9ebd8 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 7e587eed77..bcbb2c83cc 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 23:10+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ggam <ggam@brainleakage.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -215,26 +215,30 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "hace años"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Seleccionar"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Seleccionar"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Aceptar"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/es/files.po b/l10n/es/files.po
index eff94d9cc9..f6922124d9 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 3160441fa9..435a62fe2f 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index dde7058914..55007656ed 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 06773f7cd2..c51f723c6c 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index cf73637ca6..9affc11972 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 16:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ayuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ajustes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuarios"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicaciones"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administración"
@@ -113,72 +113,76 @@ msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
msgid "%s set the database host."
msgstr "%s ingresar el host de la base de datos."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Tiene que ingresar una cuenta existente o la del administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Usuario y/o contraseña de Oracle no válidos"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Usuario y/o contraseña de MySQL no válidos"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Comando infractor: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Usuario MySQL '%s'@'localhost' ya existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Eliminar este usuario de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuario MySQL '%s'@'%%' ya existe"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Eliminar este usuario de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Usuario y/o contraseña de Oracle no válidos"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Usuario y/o contraseña de MS SQL no válidos: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalación</a>."
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 4c899470e4..04074a0a42 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ggam <ggam@brainleakage.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 61e06ea4d9..60ce98ad43 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/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-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 23:50+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index c0ae45f5a3..e4e0a5550b 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "el año pasado"
msgid "years ago"
msgstr "años atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Elegir"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Elegir"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Aceptar"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index f89b59caad..a6178d4834 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 23:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index f2b512a503..14fa3cdbff 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 75310dddcc..1e7b677a93 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 6677f0c624..433e065a7c 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d22bcbdee2..0c4628ce5d 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ayuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configuración"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuarios"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicaciones"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administración"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados de a uno."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Volver a archivos"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
@@ -113,72 +113,76 @@ msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
msgid "%s set the database host."
msgstr "%s Especifique la dirección de la Base de Datos"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Debe ingresar una cuenta existente o el administrador"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "El nombre de usuario y contraseña no son válidos"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Usuario y/o contraseña MySQL no válido"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Error DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "El comando no comprendido es: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Usuario MySQL '%s'@'localhost' ya existente"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Borrar este usuario de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuario MySQL '%s'@'%%' ya existente"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Borrar este usuario de MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "El nombre de usuario y contraseña no son válidos"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tu servidor web no está configurado todavÃa para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, comprobá nuevamente la <a href='%s'>guÃa de instalación</a>."
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index fdf454a85e..d2e301928f 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:05+0200\n"
-"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 9912a5ca2b..701428e5ae 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index a03e773beb..44a8a4e36b 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "viimasel aastal"
msgid "years ago"
msgstr "aastat tagasi"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vali"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Loobu"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vali"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 3084922f77..025cdc35cf 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index bcacfde3df..347a4b9d54 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index a698beda26..90d63ed0ae 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:07+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 655ddff375..632d1ffb0f 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 7015ed74a8..15363d6f0e 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 08:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Abiinfo"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Isiklik"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Seaded"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Kasutajad"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Rakendused"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
@@ -114,72 +114,76 @@ msgstr "%s punktide kasutamine andmebaasi nimes pole lubatud"
msgid "%s set the database host."
msgstr "%s määra andmebaasi server."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Sisesta kas juba olemasolev konto või administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Andmebaasi viga: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Tõrkuv käsk oli: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Kustuta see kasutaja MySQL-ist"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Kustuta see kasutaja MySQL-ist."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
-#: setup.php:859
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
-#: setup.php:860
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 8ba6e31707..6162b117d9 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 93e601cf3e..8ced5675c1 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 07:58+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 930dc72fd7..1678d02561 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "joan den urtean"
msgid "years ago"
msgstr "urte"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ados"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Aukeratu"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Aukeratu"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ez"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ados"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index df564bee56..b63a4ea80e 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index f6059f3288..c1517d8e38 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index ca0772183c..7b2e073f37 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index d29b34cf73..d0cad8e270 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 2319ead910..0fb97f4caf 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Laguntza"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pertsonala"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ezarpenak"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Erabiltzaileak"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikazioak"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP deskarga ez dago gaituta."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Fitxategiak banan-banan deskargatu behar dira."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Itzuli fitxategietara"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
@@ -113,72 +113,76 @@ msgstr "%s ezin duzu punturik erabili datu basearen izenean."
msgid "%s set the database host."
msgstr "%s sartu datu basearen hostalaria."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB errorea: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Errorea komando honek sortu du: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Ezabatu erabiltzaile hau MySQLtik"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Ezabatu erabiltzaile hau MySQLtik."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 6c4e25ee0a..5564b94a31 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index c0a31304c6..a86914e471 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index b399c5fbc0..dc320638bd 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "سال قبل"
msgid "years ago"
msgstr "سال‌های قبل"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "قبول"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "انتخاب کردن"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "منصر٠شدن"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "انتخاب کردن"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "نه"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index ca53e5b2c9..b16787e022 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index d9f3a99ddf..316ca3fb55 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9bc4ac8a32..f23556b137 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index adcafe886a..a246816ff7 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 41bd3beeae..62b626ded1 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "راه‌نما"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "شخصی"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "تنظیمات"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "کاربران"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr " برنامه ها"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "مدیر"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "دانلود به صورت Ùشرده غیر Ùعال است"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Ùایل ها باید به صورت یکی یکی دانلود شوند"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "بازگشت به Ùایل ها"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Ùایل های انتخاب شده بزرگتر از آن هستند Ú©Ù‡ بتوان یک Ùایل Ùشرده تولید کرد"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اØتمالاً وب سرور شما طوری تنظیم نشده است Ú©Ù‡ اجازه ÛŒ همگام سازی Ùایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار اÙتاده است."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "لطÙاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 2b0be04165..373f6ca85e 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 4a8fe98a4c..1d8c8ce4b6 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 03746586e2..ec04afbad4 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index a43906c14d..0625ba07dd 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index 93a7b3b4ed..8996a10489 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/lib.po
@@ -7,53 +7,53 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "asetukset"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 0110a051c4..e2afacc780 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
@@ -213,26 +213,30 @@ msgstr "viime vuonna"
msgid "years ago"
msgstr "vuotta sitten"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Valitse"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Peru"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Valitse"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -406,7 +410,7 @@ msgstr ""
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
@@ -564,7 +568,7 @@ msgstr "verkkopalvelut hallinnassasi"
#: templates/layout.user.php:36
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
#: templates/layout.user.php:61
msgid "Log out"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index d1f62c02c7..35eb801053 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 5063d70911..edd382a35e 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index dedda4f435..3b9d716daf 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index b3da91aeff..851ab24cd6 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 4a438cdbf2..14b138f950 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
@@ -17,43 +18,43 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ohje"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Henkilökohtainen"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Asetukset"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Käyttäjät"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Sovellukset"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Ylläpitäjä"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP-lataus on poistettu käytöstä."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Tiedostot on ladattava yksittäin."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Takaisin tiedostoihin"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
@@ -113,72 +114,76 @@ msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Oracle-yhteyttä ei voitu muodostaa"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Tietokantavirhe: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Pudota tämä käyttäjä MySQL:stä"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Pudota tämä käyttäjä MySQL:stä."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 52d5c8723a..6ff0246e51 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 0bfc9766d9..d4087f7e42 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 62215da210..89298278d5 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: msoko <sokolovitch@yahoo.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "l'année dernière"
msgid "years ago"
msgstr "il y a plusieurs années"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Choisir"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annuler"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Choisir"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index aef01563f9..3bea1fc06d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 1038a04378..6426a14ef8 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index d1da943c7c..72d0af006b 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 1116a5b394..699ddf1fa0 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 6443c8f3bd..fc6f5e5ae5 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Aide"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personnel"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Paramètres"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utilisateurs"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applications"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administration"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Téléchargement ZIP désactivé."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Les fichiers nécessitent d'être téléchargés un par un."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Retour aux Fichiers"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
@@ -113,72 +113,76 @@ msgstr "%s vous nez pouvez pas utiliser de points dans le nom de la base de donn
msgid "%s set the database host."
msgstr "%s spécifiez l'hôte de la base de données."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erreur de la base de données : \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "La requête en cause est : \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà ."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Retirer cet utilisateur de la base MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà "
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Retirer cet utilisateur de la base MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index d6ec6b40d0..755128df72 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index d277eef42e..4067405dd2 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-19 01:58+0200\n"
-"PO-Revision-Date: 2013-05-18 18:01+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: plachance <patlachance@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 74443dba87..3a992b1ece 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Aceptar"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escoller"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escoller"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Aceptar"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 627dadfcfa..8b39cf6301 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index d0b6177856..5353e0077d 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index e9c4c07adc..90d51ee3cf 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 917e0cfc51..ecaed1a19b 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index f537590573..e5cf1f4955 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Axuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persoal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Axustes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuarios"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicativos"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administración"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "As descargas ZIP están desactivadas."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros necesitan seren descargados dun en un."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Volver aos ficheiros"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
@@ -113,72 +113,76 @@ msgstr "%s non se poden empregar puntos na base de datos"
msgid "%s set the database host."
msgstr "%s estabeleza o servidor da base de datos"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Deberá introducir unha conta existente ou o administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Produciuse un erro na base de datos: «%s»"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "A orde ofensiva foi: «%s»"
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O usuario MySQL '%s'@'localhost' xa existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Omitir este usuario de MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "O usuario MySQL «%s»@«%%» xa existe."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Omitir este usuario de MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s"
-#: setup.php:858
+#: setup.php:867
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:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Volva comprobar as <a href='%s'>guÃas de instalación</a>"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 3914db5ce1..74c09165be 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index a4c52f858f..49b8fa8f96 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 11:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index d605f6893b..0af74d8309 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "×©× ×” שעברה"
msgid "years ago"
msgstr "×©× ×™×"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "בסדר"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "בחירה"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ביטול"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "בחירה"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ל×"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/he/files.po b/l10n/he/files.po
index a9d272af9c..abb7b0cc67 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index c0c781c9cd..9a1d53589b 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index a457a7f614..c9c3852419 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 7c32f2b83b..dfdeec5351 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index d611275471..0f47beffef 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "עזרה"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "×ישי"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "הגדרות"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "משתמשי×"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "יישומי×"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "×ž× ×”×œ"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "הורדת ZIP כבויה"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "יש להוריד ×ת ×”×§×‘×¦×™× ×חד ×חרי ×”×©× ×™."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "חזרה לקבצי×"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "×”×§×‘×¦×™× ×”× ×‘×—×¨×™× ×’×“×•×œ×™× ×ž×™×“×™ ליצירת קובץ zip."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index fa36b2f31e..e3beab8096 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 86da072797..7612e8edea 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 09e45c10d5..7b7465c414 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index bee0b2803d..b6ed4f2b48 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "सहयोग"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "यकà¥à¤¤à¤¿à¤—त"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "सेटिंगà¥à¤¸"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "उपयोगकरà¥à¤¤à¤¾"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 73cc62216f..9471638d9f 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "prošlu godinu"
msgid "years ago"
msgstr "godina"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "U redu"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Izaberi"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Odustani"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Izaberi"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "U redu"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 8e5d034383..d85601532c 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 2e386aed7b..6eef1684f4 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 7e51b0c2de..6a0b1c13e7 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index a0d1710ecd..7c054264c4 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 4004b99b0e..98511a6ff2 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoć"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobno"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Postavke"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Korisnici"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikacije"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrator"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 958c0ac531..f86beb7215 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 166e8e4738..ec2531ec06 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 3d1f00c6a4..e077229e9a 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "tavaly"
msgid "years ago"
msgstr "több éve"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Válasszon"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Mégsem"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Válasszon"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nem"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index bbdedfe71e..11ac1f30c0 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index f040dbabdc..45c8d923e2 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index c2a6ad60a7..56e7f66070 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 2b1cf55a60..3b66e1260b 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 9b4f3529f8..a03140c35c 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Súgó"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Személyes"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "BeállÃtások"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Felhasználók"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Alkalmazások"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Adminsztráció"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "A ZIP-letöltés nincs engedélyezve."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "A fájlokat egyenként kell letölteni."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Vissza a Fájlokhoz"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "A kiválasztott fájlok túl nagyok a zip tömörÃtéshez."
@@ -113,72 +113,76 @@ msgstr "%s az adatbázis neve nem tartalmazhat pontot"
msgid "%s set the database host."
msgstr "%s adja meg az adatbázist szolgáltató számÃtógép nevét."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Adatbázis hiba: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "A hibát ez a parancs okozta: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Törölje ezt a felhasználót a MySQL-ből"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Törölje ezt a felhasználót a MySQL-ből."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Az Ön webkiszolgálója nincs megfelelÅ‘en beállÃtva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepÃtési útmutatót</a>."
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 4bc6f8ef6f..357d84fe56 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 537f774ff5..1cfe317651 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 52f66f4a8d..72daa086dd 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index a6e391b464..245e624257 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 22d56339ab..c39089bded 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index 57d556aab1..afbe098759 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 0ce7e26c45..4d039f2ea6 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 8e5b97b1c5..42c8432317 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancellar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 861f74f821..e30ef22aa4 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index bebf028aa8..e59e245c38 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 0234ab82aa..b4104ed933 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 262c7e82f7..788abf2929 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 304647c370..a1ee19817d 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Adjuta"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configurationes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usatores"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applicationes"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administration"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 9297795c3b..2a9cb44575 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 2cccdd93f8..df0015b677 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index e17e73ed17..059487c899 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "tahun kemarin"
msgid "years ago"
msgstr "beberapa tahun lalu"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Oke"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Pilih"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Pilih"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Tidak"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Oke"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 9d29950e69..2b55a07afc 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index af35c34bf0..560eebccca 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 7e044193ad..153f33d41c 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index eb5ff111db..01a06ac1fa 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 88c6934ad6..1339358d4d 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Bantuan"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pribadi"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Setelan"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Pengguna"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikasi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Pengunduhan ZIP dimatikan."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Berkas harus diunduh satu persatu."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Kembali ke Daftar Berkas"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
@@ -113,72 +113,76 @@ msgstr "%sAnda tidak boleh menggunakan karakter titik pada nama basis data"
msgid "%s set the database host."
msgstr "%s setel host basis data."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Galat Basis Data: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Perintah yang bermasalah: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Hapus pengguna ini dari MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Hapus pengguna ini dari MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index e490ada997..4a0a14b40b 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 339de48ade..362136515b 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 53ede14ddb..e22a70549e 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "sÃðasta ári"
msgid "years ago"
msgstr "einhverjum árum"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ã lagi"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Veldu"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Hætta við"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Veldu"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ã lagi"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/is/files.po b/l10n/is/files.po
index c568952bc0..869426fc92 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index e92632bcfa..24ffcf24c1 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index bd919a4af3..04af1ac95b 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index ceeac18a09..8883af2d41 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 3aa394501c..6e7680443b 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjálp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Um mig"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Stillingar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Notendur"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Forrit"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Stjórnun"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Slökkt á ZIP niðurhali."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Skrárnar verður að sækja eina og eina"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Aftur à skrár"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 0906807b3c..5f4d199f3e 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index ee1bb681f8..da829f884d 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index df7f35c828..dbaa6ad613 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:22+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "anno scorso"
msgid "years ago"
msgstr "anni fa"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Scegli"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annulla"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Scegli"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr "Errore durante il caricamento del modello del selezionatore di file"
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 4245330eb1..212df78a49 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 14033bcc2c..69822dc443 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 3e03f7b349..f6a7ae0e9d 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 3091e2a39f..24417db353 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index cebca82b59..9d852114bd 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:03+0200\n"
-"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -17,27 +18,27 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Aiuto"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personale"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Impostazioni"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utenti"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applicazioni"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
@@ -113,72 +114,76 @@ msgstr "%s non dovresti utilizzare punti nel nome del database"
msgid "%s set the database host."
msgstr "%s imposta l'host del database."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome utente e/o password di PostgreSQL non validi"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "È necessario inserire un account esistente o l'amministratore."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome utente e/o password di Oracle non validi"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "La connessione a Oracle non può essere stabilita"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome utente e/o password di MySQL non validi"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Errore DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Il comando non consentito era: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "L'utente MySQL '%s'@'localhost' esiste già ."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Elimina questo utente da MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "L'utente MySQL '%s'@'%%' esiste già "
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Elimina questo utente da MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome utente e/o password di Oracle non validi"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome utente e/o password MS SQL non validi: %s"
-#: setup.php:859
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
-#: setup.php:860
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index ca626d4fa3..ae610e485c 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:05+0200\n"
-"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 294dede933..21ebc69f2a 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index f36a992b11..beac431856 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "一年å‰"
msgid "years ago"
msgstr "å¹´å‰"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "é¸æŠž"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ã‚ャンセル"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "é¸æŠž"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ã¯ã„"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ã„ã„ãˆ"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 32f0f5daf3..9990444dd1 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 12:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index ebea1cd842..fc034819a2 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index c6e1114ec1..cf0e397f11 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index bdec5a3450..669aa32490 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index a65b9bba76..6d06b310e7 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ヘルプ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "個人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "è¨å®š"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ユーザ"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "アプリ"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管ç†"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIPダウンãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "ファイルã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "ファイルã«æˆ»ã‚‹"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPファイルã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
@@ -113,72 +113,76 @@ msgstr "%s ã§ã¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹åã«ãƒ‰ãƒƒãƒˆã‚’利用ã§ããªã„ã‹ã‚‚ã—
msgid "%s set the database host."
msgstr "%s ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ›ã‚¹ãƒˆã‚’è¨å®šã—ã¾ã™ã€‚"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "æ—¢å˜ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚‚ã—ãã¯ç®¡ç†è€…ã®ã©ã¡ã‚‰ã‹ã‚’入力ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracleã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DBエラー: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "é•åコマンド: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'localhost' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'%%' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除ã™ã‚‹ã€‚"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracleã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "é•åコマンド: \"%s\"ã€åå‰: %sã€ãƒ‘スワード: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL サーãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å/パスワードãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "WebDAVインタフェースãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBサーãƒã¯ã¾ã ファイルã®åŒæœŸã‚’許å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>インストールガイド</a>をよã確èªã—ã¦ãã ã•ã„。"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 5c7b4905c9..6444931858 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 4c7f9ca2dc..db962e11ee 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 07:58+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index b139973c0c..bbfe04671f 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 9590d263fb..3c158ffc46 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index e0df88abc2..a6fa0a1283 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "ბáƒáƒšáƒ წელს"
msgid "years ago"
msgstr "წლის წინ"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "დიáƒáƒ®"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "áƒáƒ ჩევáƒ"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "უáƒáƒ ყáƒáƒ¤áƒ"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "áƒáƒ ჩევáƒ"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "áƒáƒ áƒ"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 11183252ce..e94fb3a405 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 203e29f7c0..e3d4eb60b8 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:03+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 2cd7702bc6..2f4fa98163 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:03+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 41bba41dbd..023bdfaf78 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index af7df55b76..254f201809 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "დáƒáƒ®áƒ›áƒáƒ ებáƒ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "პირáƒáƒ“ი"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბი"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP download–ი გáƒáƒ—იშულიáƒ"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "ფáƒáƒ˜áƒšáƒ”ბი უნდრგáƒáƒ“მáƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თáƒáƒ¡ სáƒáƒ—ითáƒáƒáƒ“."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "უკáƒáƒœ ფáƒáƒ˜áƒšáƒ”ბში"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "áƒáƒ ჩეული ფáƒáƒ˜áƒšáƒ”ბი ძáƒáƒšáƒ˜áƒáƒœ დიდირzip ფáƒáƒ˜áƒšáƒ˜áƒ¡ გენერáƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის."
@@ -113,72 +113,76 @@ msgstr "%s áƒáƒ მიუთითáƒáƒ— წერტილი ბáƒáƒ–ის
msgid "%s set the database host."
msgstr "%s მიუთითეთ ბáƒáƒ–ის ჰáƒáƒ¡áƒ¢áƒ˜."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "თქვენ უნდრშეიყვáƒáƒœáƒáƒ— áƒáƒ სებული მáƒáƒ›áƒ®áƒ›áƒáƒ ებელის სáƒáƒ®áƒ”ლი áƒáƒœ áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB შეცდáƒáƒ›áƒ: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Offending ბრძáƒáƒœáƒ”ბრიყáƒ: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი '%s'@'localhost' უკვე áƒáƒ სებáƒáƒ‘ს."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "წáƒáƒ¨áƒáƒšáƒ” ეს მáƒáƒ›áƒ®áƒáƒ›áƒ ებელი MySQL–იდáƒáƒœ"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი '%s'@'%%' უკვე áƒáƒ სებáƒáƒ‘ს"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "წáƒáƒ¨áƒáƒšáƒ” ეს მáƒáƒ›áƒ®áƒáƒ›áƒ ებელი MySQL–იდáƒáƒœ"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Offending ბრძáƒáƒœáƒ”ბრიყáƒ: \"%s\", სáƒáƒ®áƒ”ლი: %s, პáƒáƒ áƒáƒšáƒ˜: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის მáƒáƒ თებული: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "თქვენი web სერვერი áƒáƒ áƒáƒ ის კáƒáƒœáƒ¤áƒ˜áƒ’ურირებული ფáƒáƒ˜áƒš სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის, რáƒáƒ“გáƒáƒœ WebDAV ინტერფეისი შეიძლებრიყáƒáƒ¡ გáƒáƒ¢áƒ”ხილი."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "გთხáƒáƒ•áƒ— გáƒáƒ“áƒáƒáƒ—ვáƒáƒšáƒ˜áƒ”რáƒáƒ— <a href='%s'>ინსტáƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ გზáƒáƒ›áƒ™áƒ•áƒšáƒ”ვი</a>."
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index b7c222205a..04a0d9d034 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index b59faa4d49..7f6f2193d4 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index cdaa87d744..cee727ba0a 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "ìž‘ë…„"
msgid "years ago"
msgstr "ë…„ ì „"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "승ë½"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "ì„ íƒ"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "취소"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "ì„ íƒ"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "아니요"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 7db090797c..72a5537640 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 05f9ba418c..da5082097d 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 245187c115..54062f51db 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index fbea475af8..ace3627e1b 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 06d9e41f52..b97c280d47 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ë„움ë§"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ê°œì¸"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ì„¤ì •"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "사용ìž"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "앱"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "관리ìž"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP 다운로드가 비활성화ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "파ì¼ì„ 개별ì 으로 다운로드해야 합니다."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "파ì¼ë¡œ ëŒì•„가기"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "ì„ íƒí•œ 파ì¼ë“¤ì€ ZIP 파ì¼ì„ ìƒì„±í•˜ê¸°ì— 너무 í½ë‹ˆë‹¤."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index a914eb0524..2c93f03d41 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 9f36e614e1..73fcf08442 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 9a9a456888..df702490ca 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 8a8df832c2..b7ff8f3d26 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 291c1ca15a..7c929822b6 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index f1b2bac0ba..348f5fc442 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 2bf8387dbb..a1f467cb56 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "یارمەتی"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ده‌ستكاری"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "به‌كارهێنه‌ر"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "به‌رنامه‌كان"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 57cd5d6abc..20bae1d2d7 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 1a425c728d..3d3bedc560 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 91e5887e0b..463eb139e4 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "Läscht Joer"
msgid "years ago"
msgstr "Joren hier"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Auswielen"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Ofbriechen"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Auswielen"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nee"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index f6df3c8111..d52d6051d9 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 2461cbdaeb..d4781c62a4 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 8905aedf43..c88a6bd12d 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 69c55f0f89..cf346cfdc0 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 6060004b52..03a90b8536 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hëllef"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Perséinlech"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Astellungen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Benotzer"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Applicatiounen"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 6575b570b9..df0dc32b9f 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 38893be1d6..acc80e3d59 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 472e657708..d5b4a0e4df 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "praeitais metais"
msgid "years ago"
msgstr "prieš metus"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Gerai"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Pasirinkite"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Atšaukti"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Pasirinkite"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Gerai"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index c4731e2bd8..8fe91c5cfd 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 4e0ad2de01..ab55528f0b 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 3b808b3735..55fa2bf159 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 38d8809bf8..b5ac859e3e 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 91b409910d..cbc43ee811 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pagalba"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Asmeniniai"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nustatymai"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Vartotojai"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Programos"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administravimas"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP atsisiuntimo galimybė yra išjungta."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Failai turi bÅ«ti parsiunÄiami vienas po kito."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Atgal į Failus"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index e8508048b4..45772fd1b8 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 83ba46a5fd..1e73b74a00 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index f06cd6259b..27ef0cf51e 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "gÄjuÅ¡ajÄ gadÄ"
msgid "years ago"
msgstr "gadus atpakaļ"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Labi"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Izvēlieties"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Atcelt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Izvēlieties"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "JÄ"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "NÄ“"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Labi"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 40ca8300d6..64d7876673 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 8f0bcb6261..c833916c88 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index c3369954b8..ff9a877f0d 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index a777ecbef2..e376539f1d 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index c14518b06c..e27de079e8 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Palīdzība"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personīgi"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Iestatījumi"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "LietotÄji"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Lietotnes"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administratori"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP lejupielÄdÄ“Å¡ana ir izslÄ“gta."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Datnes var lejupielÄdÄ“t tikai katru atseviÅ¡Ä·i."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Atpakaļ pie datnēm"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "IzvÄ“lÄ“tÄs datnes ir pÄrÄk lielas, lai izveidotu zip datni."
@@ -113,72 +113,76 @@ msgstr "%s datubĞu nosaukumos nedrīkst izmantot punktus"
msgid "%s set the database host."
msgstr "%s iestatiet datubÄžu serveri."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nav derÄ«ga PostgreSQL parole un/vai lietotÄjvÄrds"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Jums jÄievada vai nu esoÅ¡s vai administratora konts."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nav derÄ«ga Oracle parole un/vai lietotÄjvÄrds"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB kļūda — “%sâ€"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "VainÄ«gÄ komanda bija “%sâ€"
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL lietotÄjs %s'@'localhost' jau eksistÄ“."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Izmest Å¡o lietotÄju no MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL lietotÄjs '%s'@'%%' jau eksistÄ“"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Izmest Å¡o lietotÄju no MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nav derÄ«ga Oracle parole un/vai lietotÄjvÄrds"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "VainÄ«gÄ komanda bija \"%s\", vÄrds: %s, parole: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds — %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai ļautu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "LÅ«dzu, vÄ“lreiz pÄrbaudiet <a href='%s'>instalÄ“Å¡anas palÄ«dzÄ«bu</a>."
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 0b232f50be..f8f6d620dc 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index cb1532a790..1165adf4e3 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index cffc24c7a7..3bd008969b 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "минатата година"
msgid "years ago"
msgstr "пред години"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Во ред"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Избери"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Избери"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ðе"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 299b8fd800..ec08eae8ff 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index c1d7e75e2e..129bb0f945 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 34a139dd73..f79af9510d 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index f0e618ecba..40ba1a5bec 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index e64e413995..602ebd67b8 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помош"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Лично"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ПодеÑувања"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "КориÑници"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Ðппликации"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Ðдмин"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Преземање во ZIP е иÑклучено"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Датотеките треба да Ñе Ñимнат една по една."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Ðазад кон датотеки"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Избраните датотеки Ñе преголеми за да Ñе генерира zip."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 945c5571df..658d0a099b 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 9a3f735d5e..a7c58a824e 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 366bfde66d..c7eaafc301 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Tidak"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index f213c62924..dbc1e5041c 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index f1af46895a..032ecb7e41 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index e2dd173597..d9b6bb9972 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index b54157fab2..57049cc4cd 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 7d00ce42b9..db278328fb 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Bantuan"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Peribadi"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Tetapan"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Pengguna"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikasi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 5f4003d2e8..dfb5957c75 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 784790e0e9..9525ea29a9 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 46e82a3f92..8babf35390 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "မနှစ်က"
msgid "years ago"
msgstr "နှစ် အရင်က"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "အá€á€¯á€€á€±"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "ရွေးá€á€»á€šá€º"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ပယ်ဖျက်မည်"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "ရွေးá€á€»á€šá€º"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ဟုá€á€º"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "မဟုá€á€ºá€˜á€°á€¸"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index fedecb2ad5..d99bb1abe9 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 1105b88661..bc2fd5ec55 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index f6ebed8ec4..58fc7a42e0 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "အကူအညီ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "သုံးစွဲသူ"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "အက်ဒမင်"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP ဒေါင်းလုá€á€ºá€€á€á€¯á€•á€á€á€ºá€‘ားသည်"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "ဖá€á€¯á€„်များသည် á€á€…်á€á€¯á€•á€¼á€®á€¸ á€á€…်á€á€¯á€’ေါင်းလုá€á€ºá€á€»á€›á€”်လá€á€¯á€¡á€•á€ºá€žá€Šá€º"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "ဖá€á€¯á€„်သá€á€¯á€·á€•á€¼á€”်သွားမည်"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "zip ဖá€á€¯á€„်အဖြစ်ပြုလုပ်ရန် ရွေးá€á€»á€šá€ºá€‘ားသောဖá€á€¯á€„်များသည် အရမ်းကြီးလွန်းသည်"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index e229487e28..e7dd2477aa 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "forrige år"
msgid "years ago"
msgstr "Ã¥r siden"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Velg"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Velg"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index f1431fbd1f..e107543d82 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 23:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 476b81ff07..917f02c2bd 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 12:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index ab1517bb3f..868b4fd6eb 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 9ee75563d8..7f0b7fad5f 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 12:10+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 38770e18e4..08f2ae8e5f 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:03+0200\n"
-"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjelp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personlig"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Innstillinger"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Brukere"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apper"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:859
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
-#: setup.php:860
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 2f581ebbee..3debc0b668 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:05+0200\n"
-"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index f6e688d102..49f8151a5f 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index d35357a3ad..5f6f7e5413 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "vorig jaar"
msgid "years ago"
msgstr "jaar geleden"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Kies"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annuleer"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Kies"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nee"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index c394fb203c..0c04c6ce0d 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 1373520072..643ebd1c4b 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 75628354dc..924a6cedb2 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index ba389cde31..7ccc62dbeb 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index c56862e931..08b48b27de 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Help"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Persoonlijk"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Instellingen"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Gebruikers"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Beheerder"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP download is uitgeschakeld."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Bestanden moeten één voor één worden gedownload."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Terug naar bestanden"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
@@ -113,72 +113,76 @@ msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
msgid "%s set the database host."
msgstr "%s instellen databaseservernaam."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Geef of een bestaand account op of het beheerdersaccount."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Fout: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Onjuiste commande was: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Verwijder deze gebruiker uit MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Verwijder deze gebruiker uit MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 24737684e0..84e5a9fa47 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index af11411cb6..5fae8e1644 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 08adadd957..4cdd6e7d94 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "i fjor"
msgid "years ago"
msgstr "Ã¥r sidan"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Greitt"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vel"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vel"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Greitt"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 8bf6b233b5..4fb7cfb26d 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 13:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 444e7be0a1..2cdb030bf8 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 1edc28d346..1b09608a94 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 13:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 6abeaf62de..fb0d4b784b 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 11:10+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 0fced10d32..f36faa6225 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-16 09:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjelp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personleg"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Innstillingar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Brukarar"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Program"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrer"
@@ -114,72 +114,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:859
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
-#: setup.php:860
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 7661744100..ad438e4bd5 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index aa60a28904..fcc357a041 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index fb3ea7ee10..e9d807e557 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "an passat"
msgid "years ago"
msgstr "ans a"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "D'accòrdi"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "CausÃs"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Annula"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "CausÃs"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ã’c"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "D'accòrdi"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 6add33eaeb..69839d306e 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index d4da7a4ee8..62da99608e 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 9f1de7e3bd..5a45905848 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 68e83d04f5..5258fea480 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 68de313804..74a296f1ae 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configuracion"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usancièrs"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Apps"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Avalcargar los ZIP es inactiu."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Los fichièrs devan èsser avalcargats un per un."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Torna cap als fichièrs"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index cf78308378..0c5eb4da19 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 32a16d4e26..b30db96613 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 8317035b93..2fb34b855d 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-22 02:17+0200\n"
-"PO-Revision-Date: 2013-05-21 07:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "w zeszłym roku"
msgid "years ago"
msgstr "lat temu"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Wybierz"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Anuluj"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Wybierz"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nie"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index bd2888a2b8..ea95d73c5b 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index a130c038c3..964bffff5d 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-22 02:17+0200\n"
-"PO-Revision-Date: 2013-05-21 07:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index e97f578322..ada05ce04a 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 0b1495b8d0..3818146e22 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index db80af0529..9503eaaf77 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoc"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobiste"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Użytkownicy"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikacje"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrator"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Pobieranie ZIP jest wyłączone."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Pliki muszą zostać pobrane pojedynczo."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Wróć do plików"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
@@ -113,72 +113,76 @@ msgstr "%s nie można używać kropki w nazwie bazy danych"
msgid "%s set the database host."
msgstr "%s ustaw hosta bazy danych."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Należy wprowadzić istniejące konto użytkownika lub administratora."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "BÅ‚Ä…d DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Niepoprawna komenda: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Użytkownik MySQL '%s'@'localhost' już istnieje"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Usuń tego użytkownika z MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Użytkownik MySQL '%s'@'%%t' już istnieje"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Usuń tego użytkownika z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s."
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 569af9fbc9..dd5b124971 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 1cd3ec895b..1bf45fe73e 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 39727ca3ba..2407cc50ed 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 8e52449664..b650901aca 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index d30c8af652..08ef2633ca 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.po
@@ -7,53 +7,53 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 6624c31b20..7245910d41 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index e92342be50..e3e181fda0 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "último ano"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escolha"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escolha"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Não"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 5d86a5195a..3228aff3b8 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 2ff8ade49d..ab7d6a869c 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 12:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index cbd0b6110f..19b81cd23c 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index c9a34e6093..4d9963fa4f 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index d2ecaa0216..91dd830a9b 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:59+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,43 +18,43 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pessoal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ajustes"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Usuários"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicações"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Download ZIP está desligado."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Arquivos precisam ser baixados um de cada vez."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Voltar para Arquivos"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
@@ -113,72 +114,76 @@ msgstr "%s você não pode usar pontos no nome do banco de dados"
msgid "%s set the database host."
msgstr "%s defina o host do banco de dados."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Você precisa inserir uma conta existente ou o administrador."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Conexão Oracle não pode ser estabelecida"
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erro no BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Comando ofensivo era: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O usuário MySQL '%s'@'localhost' já existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Derrubar este usuário do MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Usuário MySQL '%s'@'%%' já existe"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Derrube este usuário do MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index c5cf67cadd..98faa1feb7 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index eb862c273a..943319be94 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 3e8b32a2e5..900edfc55f 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "ano passado"
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Escolha"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Escolha"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Não"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 45addc54d2..96feb9f119 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 57de8c823e..7795ea340d 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 16:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 91d49b0b9a..3b7ae09e73 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 2b2ad1fa7b..1eb1cd9f59 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 73f120fd81..0f08273d3d 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajuda"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Pessoal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Configurações"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utilizadores"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicações"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Descarregamento em ZIP está desligado."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros precisam de ser descarregados um por um."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Voltar a Ficheiros"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
@@ -113,72 +113,76 @@ msgstr "%s não é permitido utilizar pontos (.) no nome da base de dados"
msgid "%s set the database host."
msgstr "%s defina o servidor da base de dados (geralmente localhost)"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Nome de utilizador/password do PostgreSQL inválido"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Precisa de introduzir uma conta existente ou de administrador"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de utilizador/password do Oracle inválida"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Nome de utilizador/password do MySQL inválida"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Erro na BD: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "O comando gerador de erro foi: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Eliminar este utilizador do MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "O utilizador '%s'@'%%' do MySQL já existe"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Eliminar este utilizador do MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de utilizador/password do Oracle inválida"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Nome de utilizador/password do MySQL é inválido: %s"
-#: setup.php:858
+#: setup.php:867
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 não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor verifique <a href='%s'>installation guides</a>."
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 8ac1ac314a..696961608e 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 35d7b778aa..7186aa08f3 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index cb0f3da3c4..63e649fe27 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "ultimul an"
msgid "years ago"
msgstr "ani în urmă"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Alege"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Anulare"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Alege"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nu"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 4d7f89ed97..21bd251d8f 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 1823f0d97d..5d9b879da2 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index c6b95b1070..1e3ee609ff 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index c4888b41a0..0b656f9091 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 7d85c7044f..23c2edaf60 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ajutor"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personal"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Setări"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Utilizatori"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplicații"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Descărcarea ZIP este dezactivată."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Fișierele trebuie descărcate unul câte unul."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Înapoi la fișiere"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index b3c9bd49af..1cce576b45 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 46778737fa..95cdac3c71 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index fbe806ab0e..18dbafd721 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: foool <andrglad@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -214,26 +214,30 @@ msgstr "в прошлом году"
msgid "years ago"
msgstr "неÑколько лет назад"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ок"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Выбрать"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Отменить"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Выбрать"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ðет"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 99301a6874..90c3788e71 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index e418fb322c..1ed13f40c5 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 0e1c7422f8..908097384e 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 42f971ee76..63bebc7818 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 79b382794b..fd33536fc2 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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:349
+#: app.php:357
msgid "Help"
msgstr "Помощь"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Личное"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "КонфигурациÑ"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Пользователи"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ПриложениÑ"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP-Ñкачивание отключено."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Файлы должны быть загружены по одному."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Ðазад к файлам"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Выбранные файлы Ñлишком велики, чтобы Ñоздать zip файл."
@@ -113,72 +113,76 @@ msgstr "%s Ð’Ñ‹ не можете иÑпользовать точки в име
msgid "%s set the database host."
msgstr "%s задайте хоÑÑ‚ базы данных."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль PostgreSQL"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Ð’Ñ‹ должны войти или в ÑущеÑтвующий аккаунт или под админиÑтратором."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Ошибка БД: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Удалить Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Удалить Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\", имÑ: %s, пароль: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MS SQL не подходит: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 7b98bf3705..79c16bb485 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 4b20940944..ea122b169b 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index a63e62e68a..22b8f03bc0 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
@@ -259,7 +263,7 @@ msgstr ""
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "Сделать общим"
#: js/share.js:125 js/share.js:617
msgid "Error while sharing"
@@ -470,7 +474,7 @@ msgstr ""
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr ""
+msgstr "Добавить"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 9803ad4bf8..04189fc1a3 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,11 +29,11 @@ msgstr ""
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Файл не был загружен. ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ошибки нет, файл уÑпешно загружен"
#: ajax/upload.php:27
msgid ""
@@ -44,27 +44,27 @@ msgstr ""
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr ""
+msgstr "Размер загружаемого файла превыÑил макÑимально допуÑтимый в директиве MAX_FILE_SIZE, Ñпецифицированной в HTML-форме"
#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Загружаемый файл был загружен лишь чаÑтично"
#: ajax/upload.php:31
msgid "No file was uploaded"
-msgstr ""
+msgstr "Файл не был загружен"
#: ajax/upload.php:32
msgid "Missing a temporary folder"
-msgstr ""
+msgstr "ОтÑутÑтвие временной папки"
#: ajax/upload.php:33
msgid "Failed to write to disk"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ запиÑать на диÑк"
#: ajax/upload.php:51
msgid "Not enough storage available"
-msgstr ""
+msgstr "ÐедоÑтаточно меÑта в хранилище"
#: ajax/upload.php:83
msgid "Invalid directory."
@@ -76,7 +76,7 @@ msgstr ""
#: js/fileactions.js:116
msgid "Share"
-msgstr ""
+msgstr "Сделать общим"
#: js/fileactions.js:126
msgid "Delete permanently"
@@ -84,7 +84,7 @@ msgstr ""
#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
#: js/fileactions.js:194
msgid "Rename"
@@ -189,7 +189,7 @@ msgstr "Ошибка"
#: js/files.js:877 templates/index.php:69
msgid "Name"
-msgstr ""
+msgstr "ИмÑ"
#: js/files.js:878 templates/index.php:80
msgid "Size"
@@ -257,7 +257,7 @@ msgstr ""
#: templates/admin.php:26
msgid "Save"
-msgstr ""
+msgstr "Сохранить"
#: templates/index.php:7
msgid "New"
@@ -293,7 +293,7 @@ msgstr ""
#: templates/index.php:75
msgid "Download"
-msgstr ""
+msgstr "Загрузка"
#: templates/index.php:87 templates/index.php:88
msgid "Unshare"
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index 1410e66849..3efa280a09 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-23 23:58+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
@@ -20,36 +19,36 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
msgid "Access granted"
-msgstr "ДоÑтуп разрешен"
+msgstr ""
#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
msgid "Error configuring Dropbox storage"
-msgstr "Ошибка при конфигурировании хранилища Dropbox"
+msgstr ""
#: js/dropbox.js:65 js/google.js:66
msgid "Grant access"
-msgstr "ПредоÑтавить доÑтуп"
+msgstr ""
#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
-msgstr "ПожалуйÑта предÑтавьте допуÑтимый ключ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Dropbox и пароль."
+msgstr ""
#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
-msgstr "Ошибка наÑтройки хранилища Google Drive"
+msgstr ""
#: lib/config.php:431
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> \"smbclient\" не уÑтановлен. Подключение общих папок CIFS/SMB невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы уÑтановить его."
+msgstr ""
#: lib/config.php:434
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не уÑтановлена. Подключение по FTP невозможно. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы уÑтановить ее."
+msgstr ""
#: lib/config.php:437
msgid ""
@@ -60,11 +59,11 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr "Внешние ÑиÑтемы Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
#: templates/settings.php:9 templates/settings.php:28
msgid "Folder name"
-msgstr "Ð˜Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸"
+msgstr ""
#: templates/settings.php:10
msgid "External storage"
@@ -72,15 +71,15 @@ msgstr ""
#: templates/settings.php:11
msgid "Configuration"
-msgstr "КонфигурациÑ"
+msgstr ""
#: templates/settings.php:12
msgid "Options"
-msgstr "Опции"
+msgstr ""
#: templates/settings.php:13
msgid "Applicable"
-msgstr "Применимый"
+msgstr ""
#: templates/settings.php:33
msgid "Add storage"
@@ -88,11 +87,11 @@ msgstr ""
#: templates/settings.php:90
msgid "None set"
-msgstr "Ðе задан"
+msgstr ""
#: templates/settings.php:91
msgid "All Users"
-msgstr "Ð’Ñе пользователи"
+msgstr ""
#: templates/settings.php:92
msgid "Groups"
@@ -100,7 +99,7 @@ msgstr "Группы"
#: templates/settings.php:100
msgid "Users"
-msgstr "Пользователи"
+msgstr ""
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
@@ -109,16 +108,16 @@ msgstr "Удалить"
#: templates/settings.php:129
msgid "Enable User External Storage"
-msgstr "Включить пользовательÑкую внешнюю ÑиÑтему Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
-msgstr "Разрешить пользователÑм монтировать их ÑобÑтвенную внешнюю ÑиÑтему Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
+msgstr ""
#: templates/settings.php:141
msgid "SSL root certificates"
-msgstr "Корневые Ñертификаты SSL"
+msgstr ""
#: templates/settings.php:159
msgid "Import Root Certificate"
-msgstr "Импортировать корневые Ñертификаты"
+msgstr ""
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index 2f1f872d54..c0973fddbc 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_RU/files_sharing.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
@@ -20,21 +19,21 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr "Пароль"
+msgstr ""
#: templates/authenticate.php:6
msgid "Submit"
-msgstr "Передать"
+msgstr ""
#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
-msgstr "%s имеет общий Ñ Ð’Ð°Ð¼Ð¸ доÑтуп к папке %s "
+msgstr ""
#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
-msgstr "%s имеет общий Ñ Ð’Ð°Ð¼Ð¸ доÑтуп к файлу %s "
+msgstr ""
#: templates/public.php:19 templates/public.php:43
msgid "Download"
@@ -42,8 +41,8 @@ msgstr "Загрузка"
#: templates/public.php:40
msgid "No preview available for"
-msgstr "Предварительный проÑмотр недоÑтупен"
+msgstr ""
#: templates/public.php:50
msgid "web services under your control"
-msgstr "веб-ÑервиÑÑ‹ под Вашим контролем"
+msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index 4e65e5d446..7e4bcb47ed 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,7 @@ msgstr ""
#: js/trash.js:174 templates/index.php:17
msgid "Name"
-msgstr ""
+msgstr "ИмÑ"
#: js/trash.js:175 templates/index.php:27
msgid "Deleted"
@@ -77,7 +77,7 @@ msgstr ""
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 540aefaac4..31c091a0c9 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -7,53 +7,53 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
"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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ÐаÑтройки"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
#: search/provider/file.php:26 search/provider/file.php:33
msgid "Text"
-msgstr ""
+msgstr "ТекÑÑ‚"
#: search/provider/file.php:29
msgid "Images"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 5fc2851ce6..43c1d82fa7 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
@@ -139,7 +139,7 @@ msgstr ""
#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
-msgstr ""
+msgstr "Группы"
#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
@@ -147,7 +147,7 @@ msgstr ""
#: js/users.js:115 templates/users.php:155
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
#: js/users.js:269
msgid "add group"
@@ -429,7 +429,7 @@ msgstr ""
#: templates/personal.php:68
msgid "Email"
-msgstr ""
+msgstr "Email"
#: templates/personal.php:70
msgid "Your email address"
@@ -473,7 +473,7 @@ msgstr ""
#: templates/users.php:57 templates/users.php:148
msgid "Other"
-msgstr ""
+msgstr "Другое"
#: templates/users.php:82
msgid "Storage"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 5d247f8926..9e4d98945d 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: 2013-04-26 08:02+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 21ffdc00b2..ebc75e66e2 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "පෙර අවුරුද්දේ"
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "හරි"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "à¶à·à¶»à¶±à·Šà¶±"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "එපà·"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "à¶à·à¶»à¶±à·Šà¶±"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "එපà·"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index ba42d31041..58fe5a8217 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 170cf71d03..3fc997bbe1 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index e0e7c51d28..ead4e52179 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 872a72761b..df590ba871 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 992b3a584f..41cc98f783 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "උදව්"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "පෞද්ගලික"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "සිටුවම්"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "පරිà·à·“ලකයන්"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "යෙදුම්"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "පරිපà·à¶½à¶š"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP භà·à¶œà¶ කිරීම් අක්â€à¶»à·’යයි"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "ගොනු එකින් එක භà·à¶œà¶ යුà¶à·”යි"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "ගොනු වෙà¶à¶§ නà·à·€à¶ යන්න"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "à¶à·à¶»à·à¶œà¶à·Š ගොනු ZIP ගොනුවක් à¶à·à¶±à·“මට විà·à·à¶½ à·€à·à¶©à·’ය."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index dcbbfc411a..eee6f40820 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 76caf1c770..391d5cdf80 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 0d1e882f63..992dcda4c5 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "minulý rok"
msgid "years ago"
msgstr "pred rokmi"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Výber"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Výber"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ãno"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nie"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 46a8b51b5c..4107af7595 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-23 01:58+0200\n"
-"PO-Revision-Date: 2013-05-22 16:10+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index fdd045ce13..2545d3dae8 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 19:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 4dbc07b1ac..986c44241a 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index 2ae6687e69..3cb233da32 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 2db5eafdca..8f6db323d2 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoc"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osobné"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nastavenia"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "PoužÃvatelia"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Aplikácie"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Administrátor"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Sťahovanie súborov ZIP je vypnuté."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Súbory musia byť nahrávané jeden za druhým."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Späť na súbory"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Zvolené súbory sú prÃliÅ¡ veľké na vygenerovanie zip súboru."
@@ -113,72 +113,76 @@ msgstr "V názve databázy %s nemôžete použÃvaÅ¥ bodky"
msgid "%s set the database host."
msgstr "Zadajte názov poÄÃtaÄa s databázou %s."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PoužÃvateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "MusÃte zadaÅ¥ jestvujúci úÄet alebo administrátora."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "PoužÃvateľské meno a/alebo heslo pre Oracle databázu je neplatné"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "PoužÃvateľské meno a/alebo heslo pre MySQL databázu je neplatné"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Chyba DB: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Podozrivý prÃkaz bol: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "PoužÃvateľ '%s'@'localhost' už v MySQL existuje."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "ZahodiÅ¥ použÃvateľa z MySQL."
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "PoužÃvateľ '%s'@'%%' už v MySQL existuje"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "ZahodiÅ¥ použÃvateľa z MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "PoužÃvateľské meno a/alebo heslo pre Oracle databázu je neplatné"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Podozrivý prÃkaz bol: \"%s\", meno: %s, heslo: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "PoužÃvateľské meno, alebo heslo MS SQL nie je platné: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnú prÃruÄku</a>."
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index a440dde639..2121c51ae9 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 740f7040fb..3d3ff42198 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c16d289f19..1cc6c8be92 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "lansko leto"
msgid "years ago"
msgstr "let nazaj"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "V redu"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Izbor"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "PrekliÄi"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Izbor"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "V redu"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 76edc3fd31..98dbfaa2d2 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 9b47116228..bfc8aef54d 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index e1d7adc791..3a379322f4 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 2ce8f9f03e..4e473f9e0d 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 636c2a101d..f00e1cfe9e 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "PomoÄ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Osebno"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Nastavitve"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Uporabniki"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Programi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Skrbništvo"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Prejemanje datotek v paketu ZIP je onemogoÄeno."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Datoteke je mogoÄe prejeti le posamiÄno."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Nazaj na datoteke"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
@@ -113,72 +113,76 @@ msgstr "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik."
msgid "%s set the database host."
msgstr "%s - vnos gostitelja podatkovne zbirke."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Prijaviti se je treba v obstojeÄi ali pa skrbniÅ¡ki raÄun."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Napaka podatkovne zbirke: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "NapaÄni ukaz je: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "NapaÄni ukaz je: \"%s\", ime: %s, geslo: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Spletni stražnik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Preverite <a href='%s'>navodila namestitve</a>."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index b4b74e10e0..7aac3a9c61 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index b3d02a1760..3ef07c58ce 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 758cd937b6..53b53efb25 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "vitin e shkuar"
msgid "years ago"
msgstr "vite më parë"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Në rregull"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Zgjidh"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Anulo"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Zgjidh"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Jo"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Në rregull"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 56ec4bbaf9..3cc87f36be 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 7e3f1dba76..40f6851fca 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 2ce9c10dbb..40e4950386 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 630e921b32..0c02b9d17a 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 15687a76d3..ec8afab2c5 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Ndihmë"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personale"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Parametra"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Përdoruesit"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "App"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Skedarët duhet të shkarkohen një nga një."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Kthehu tek skedarët"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP."
@@ -113,72 +113,76 @@ msgstr "%s nuk mund të përdorni pikat tek emri i database-it"
msgid "%s set the database host."
msgstr "%s caktoni pozicionin (host) e database-it."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Veprim i gabuar i DB-it: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Komanda e gabuar ishte: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Eliminoni këtë përdorues nga MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Eliminoni këtë përdorues nga MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 4c1226537b..f8450cb1d6 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 839c6616a8..9e225efdf3 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 6866ad5df6..b1d533cb3e 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "прошле године"
msgid "years ago"
msgstr "година раније"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "У реду"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Одабери"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Одабери"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ðе"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 008e27f634..f9bd1de117 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 83105656cf..5a4ff450a2 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 60f8cfce70..b129a71228 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index 0c35b37936..fa2752d7b1 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index f2b8abefc5..485582b642 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Помоћ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Лично"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ПоÑтавке"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "КориÑници"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Ðпликације"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ÐдминиÑтратор"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Преузимање ZIP-а је иÑкључено."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Датотеке морате преузимати једну по једну."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Ðазад на датотеке"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Изабране датотеке Ñу превелике да биÑте направили ZIP датотеку."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб Ñервер тренутно не подржава Ñинхронизацију датотека јер Ñе чини да је WebDAV Ñучеље неиÑправно."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Погледајте <a href='%s'>водиче за инÑталацију</a>."
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 372c87d23e..59a1cb704f 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index d13753c822..d743873a29 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 555da08b9e..0fdd177341 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Otkaži"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index e7c6cc4f53..3b0df58b92 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 1c91965f29..c5525d7bad 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index a36fa20fae..6b3b853248 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 717696ba37..48e196f8f1 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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index d2b1782668..8b50f9673b 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Pomoć"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "LiÄno"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Podešavanja"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Korisnici"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Programi"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Adninistracija"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index dbfe43bcfc..43034f3b49 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Obriši"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index bd03e0f487..9363336483 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "förra året"
msgid "years ago"
msgstr "Ã¥r sedan"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Välj"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Välj"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nej"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index f99535735a..77f7e3f849 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 9ebda80a2d..8264e4d067 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 2ba2bb298c..652c7f84c9 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 33c448aa9e..a2f0d01a62 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index d02feb64ea..a387fe4822 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Hjälp"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Personligt"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Inställningar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Användare"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Program"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Admin"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Nerladdning av ZIP är avstängd."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Filer laddas ner en åt gången."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Tillbaka till Filer"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Valda filer är för stora för att skapa zip-fil."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 3be85181fe..b2802dad5a 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 9fca84c657..466f22acaf 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 07325fade9..695c92e17f 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "கடநà¯à®¤ வரà¯à®Ÿà®®à¯"
msgid "years ago"
msgstr "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "சரி"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "தெரிவà¯à®šà¯†à®¯à¯à®• "
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "இரதà¯à®¤à¯ செயà¯à®•"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "தெரிவà¯à®šà¯†à®¯à¯à®• "
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ஆமà¯"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "இலà¯à®²à¯ˆ"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 9ad71c544c..544d15e92e 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 2d1e185537..e5905a94a4 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 2522409a0d..4c9c4ab550 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 79d45d3828..bb442763f3 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 5ab85c3d26..84fbc746d8 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "உதவி"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "தனிபà¯à®ªà®Ÿà¯à®Ÿ"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "அமைபà¯à®ªà¯à®•à®³à¯"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "பயனாளரà¯"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "செயலிகளà¯"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "நிரà¯à®µà®¾à®•à®®à¯"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "வீசொலிப௠பூடà¯à®Ÿà¯ பதிவிறகà¯à®•à®®à¯ நிறà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "கோபà¯à®ªà¯à®•à®³à¯à®’னà¯à®±à®©à¯ பின௠ஒனà¯à®±à®¾à®• பதிவிறகà¯à®•à®ªà¯à®ªà®Ÿà®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ செலà¯à®•"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "வீ சொலிக௠கோபà¯à®ªà¯à®•à®³à¯ˆ உரà¯à®µà®¾à®•à¯à®•à¯à®µà®¤à®±à¯à®•à¯ தெரிவà¯à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿ கோபà¯à®ªà¯à®•à®³à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®µà¯ˆ"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 96dcf4f465..22fbcef78d 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 2a5d7bf540..2e07179f97 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index a4aaf33a49..514c0cb50a 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "పోయిన సంవతà±à°¸à°°à°‚"
msgid "years ago"
msgstr "సంవతà±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "సరే"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "à°…à°µà±à°¨à±"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "కాదà±"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 2dbe5ff11e..95fe99e2dd 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 7f8b65ba98..4b741282d9 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 90a947f784..726aa934a2 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index a51822fe45..4cc91ef1e9 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "సహాయం"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "అమరికలà±"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "వాడà±à°•à°°à±à°²à±"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index fb91ffa67f..0468471645 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index eebc4da9ed..45077de378 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ebe74619f0..f16aa6c446 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 6560570071..6b6a9e05aa 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 5873f3e7b8..199e2828b8 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 004046e622..db915a6782 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 953d87a720..4b97bd4b71 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 4efb1b73c6..51720b0f3d 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index fccd0997a4..eb2b51e4f7 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0edba6ae59..cdf00a0782 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 70a5168611..bbf68c3a5a 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index c440c988ca..51427e13fb 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a52cf0777f..4783300333 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-05-23 01:58+0200\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 568570f897..d4d148f2c9 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "ปีที่à¹à¸¥à¹‰à¸§"
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "ตà¸à¸¥à¸‡"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "เลืà¸à¸"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "เลืà¸à¸"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ตà¸à¸¥à¸‡"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ไม่ตà¸à¸¥à¸‡"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 52962e21fb..0ee6248b27 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 4aea7d4916..d1679d21f4 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index eab4fbbbd7..6e48c1ef81 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 0481d13799..891b4da11c 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index cbe2379999..4dbdc8be1d 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ช่วยเหลืà¸"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ส่วนตัว"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ตั้งค่า"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ผู้ใช้งาน"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "à¹à¸à¸›à¸¯"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ผู้ดูà¹à¸¥"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "คุณสมบัติà¸à¸²à¸£à¸”าวน์โหลด zip ถูà¸à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ว้"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "à¸à¸¥à¸±à¸šà¹„ปที่ไฟล์"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "ไฟล์ที่เลืà¸à¸à¸¡à¸µà¸‚นาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸—ี่จะสร้างเป็นไฟล์ zip"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 0c88025491..4d1ea92e63 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index ebb8a40aef..57aa79e2fa 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 6049fb79a2..d006494382 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "geçen yıl"
msgid "years ago"
msgstr "yıl önce"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Tamam"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "seç"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Ä°ptal"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "seç"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Hayır"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Tamam"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 204e6030a0..676603c65a 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-23 01:58+0200\n"
-"PO-Revision-Date: 2013-05-22 07:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index b3199728fd..089a46d9f6 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 58a33bd65a..546d65d8d9 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index ff3ae0eaac..f00cf7484c 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 851ae213cc..df47baf932 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-04 01:59+0200\n"
-"PO-Revision-Date: 2013-05-03 12:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Yardım"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "KiÅŸisel"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Ayarlar"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "Kullanıcılar"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Uygulamalar"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Yönetici"
@@ -114,72 +114,76 @@ msgstr "%s veritabanı adında nokta kullanamayabilirsiniz"
msgid "%s set the database host."
msgstr "%s veritabanı sunucu adını tanımla"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Bir konto veya kullanici birlemek ihtiyacin. "
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. "
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "DB Hata: ''%s''"
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Komut rahasiz ''%s''. "
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL kullanici '%s @local host zatan var. "
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Bu kullanici MySQLden list disari koymak. "
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Bu kulanıcıyı MySQL veritabanından kaldır"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. "
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 2734559427..8f5cf140aa 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index fa75800dde..bfd9ca6593 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-23 01:58+0200\n"
-"PO-Revision-Date: 2013-05-22 08:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 4642a6e1a2..0c10b9e073 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "جەزملە"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "ۋاز كەچ"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ياق"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index f69fcf0815..f4bce231f7 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index 1da94038c5..5c120aea0b 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:50+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 85d88c6181..99599acd88 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-08 15:21+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: uqkun <uqkun@outlook.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index d9d8571860..986d49ce3c 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index a14470fe87..0585574309 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:02+0200\n"
-"PO-Revision-Date: 2013-05-04 12:00+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "ياردەم"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "شەخسىي"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "تەÚشەكلەر"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "ئىشلەتكۈچىلەر"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ئەپلەر"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index d7d4d921f9..24ee51def4 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 96f22a9e8b..79859271ff 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 0d847d9392..60c0ac8968 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "минулого року"
msgid "years ago"
msgstr "роки тому"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Обрати"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Відмінити"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Обрати"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ÐÑ–"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Ok"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 617b66ad3e..15bd0c1dfe 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index ef3ddfd152..0a8a49f6f9 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index a78808b327..7ac8549950 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 7c13dac4da..fa4cda467f 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index af5a7ee2d8..e9b87cf8c6 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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:349
+#: app.php:357
msgid "Help"
msgstr "Допомога"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ОÑобиÑте"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "ÐалаштуваннÑ"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "КориÑтувачі"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Додатки"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Ðдмін"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Файли повинні бути завантаженні поÑлідовно."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "ПовернутиÑÑ Ð´Ð¾ файлів"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Вибрані фали завеликі Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ zip файлу."
@@ -113,72 +113,76 @@ msgstr "%s не можна викориÑтовувати крапки в наз
msgid "%s set the database host."
msgstr "%s вÑтановити хоÑÑ‚ бази даних."
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "Вам потрібно ввеÑти або Ñ–Ñнуючий обліковий Ð·Ð°Ð¿Ð¸Ñ Ð°Ð±Ð¾ administrator."
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "Помилка БД: \"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "Команда, що викликала проблему: \"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "КориÑтувач MySQL '%s'@'localhost' вже Ñ–Ñнує."
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "Видалити цього кориÑтувача з MySQL"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "КориÑтувач MySQL '%s'@'%%' вже Ñ–Ñнує"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "Видалити цього кориÑтувача з MySQL."
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "Команда, що викликала проблему: \"%s\", ім'Ñ: %s, пароль: %s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні: %s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш Web-Ñервер ще не налаштований належним чином Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб дозволити Ñинхронізацію файлів, через те що Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, здаєтьÑÑ, зламаний."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Будь лаÑка, перевірте <a href='%s'>інÑтрукції по вÑтановленню</a>."
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index dcbbcd3055..3fb2467187 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index e57d6368ab..98019dfaf4 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index b16f5c533b..b9c4d4d054 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "اوکے"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "منتخب کریں"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "منسوخ کریں"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "منتخب کریں"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Ûاں"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ù†Ûیں"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index e34cfafff4..2cedc88260 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 8844c8c59e..a767e6d265 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index f12d98a35a..c783af97eb 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 21:52+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "مدد"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ذاتی"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "سیٹینگز"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "یوزرز"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "ایپز"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "ایڈمن"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index f659385b36..bc06878201 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 61c99c1fcb..0f8cb26a3d 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index d5016bce85..e5093a94fd 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "năm trước"
msgid "years ago"
msgstr "năm trước"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Äồng ý"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Chá»n"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "Hủy"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Chá»n"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Không"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "Äồng ý"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 67d6e94d7f..2cca8bcaa0 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index fd539c747a..c9777d959a 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-05 06:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 97af1379ae..3421e01a4e 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 6e5de8cd4c..3a638c39e2 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 186aeccd94..9cf90a1574 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "Giúp đỡ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "Cá nhân"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "Cà i đặt"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "NgÆ°á»i dùng"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "Ứng dụng"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "Quản trị"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "Tải vỠZIP đã bị tắt."
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "Táºp tin cần phải được tải vá» từng ngÆ°á»i má»™t."
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "Trở lại táºp tin"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "Táºp tin được chá»n quá lá»›n để tạo táºp tin ZIP."
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 22139400b8..645bd7baf8 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index c94715753c..2a8995440e 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 0915509f39..0388186c3c 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr "去年"
msgid "years ago"
msgstr "å¹´å‰"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "好的"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "选择"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "选择"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "å¦"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index c6e9e821ef..87d234de37 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 3ab0f8b002..f65232c72a 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 61e2a5168a..2b091b8d3e 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index a6c759cdf0..fb84ff6561 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 526d5f2461..65e690b4fe 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "帮助"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "ç§äºº"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "设置"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "用户"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "程åº"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管ç†å‘˜"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP 下载已关é—"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "需è¦é€ä¸ªä¸‹è½½æ–‡ä»¶ã€‚"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "返回到文件"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "选择的文件太大而ä¸èƒ½ç”Ÿæˆ zip 文件。"
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "å› WebDAV接å£æ•…障，您的网络æœåŠ¡å™¨å¥½åƒå¹¶æœªå…许文件åŒæ¥ã€‚"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请åŒå‡»<a href='%s'>安装å‘导</a>。"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index bd917dd80d..61d98359d0 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 8eb298ee7e..80b5a7195f 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 59cf8218e1..73520d3ac5 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "去年"
msgid "years ago"
msgstr "å¹´å‰"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "好"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "选择(&C)..."
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "选择(&C)..."
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "å¦"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 7bd8ad81e9..00903854a0 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 4c1d4d64de..6e798b3bc3 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 32f5435899..77a25d1939 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 75da62afbf..52c54bcbee 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 27fe05a7de..bad9755133 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "帮助"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "个人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "设置"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "用户"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "应用"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管ç†"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP 下载已ç»å…³é—"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "需è¦é€ä¸€ä¸‹è½½æ–‡ä»¶"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "回到文件"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§ï¼Œæ— æ³•ç”Ÿæˆ zip 文件。"
@@ -113,72 +113,76 @@ msgstr "%s 您ä¸èƒ½åœ¨æ•°æ®åº“å称ä¸ä½¿ç”¨è‹±æ–‡å¥å·ã€‚"
msgid "%s set the database host."
msgstr "%s 设置数æ®åº“所在主机。"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "ä½ éœ€è¦è¾“入一个数æ®åº“ä¸å·²æœ‰çš„账户或管ç†å‘˜è´¦æˆ·ã€‚"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "æ•°æ®åº“错误：\"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "冲çªå‘½ä»¤ä¸ºï¼š\"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL 用户 '%s'@'localhost' å·²å˜åœ¨ã€‚"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "建议从 MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL 用户 '%s'@'%%' å·²å˜åœ¨"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "建议从 MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·ã€‚"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "冲çªå‘½ä»¤ä¸ºï¼š\"%s\"，å称：%s，密ç ：%s"
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 用户åå’Œ/或密ç æ— æ•ˆï¼š%s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…许文件åŒæ¥, å› ä¸ºWebDAV的接å£ä¼¼ä¹Žå·²æŸå."
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指å—</a>."
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index fef0cdd11b..6056eafbef 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 47d10ead36..d4dd9b9928 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 000af61d0f..62dcdad63a 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "OK"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
+#: js/oc-dialogs.js:181
+msgid "Ok"
+msgstr "OK"
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 57d0ed08b7..beaef109c9 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 1b8a3b8705..3d43486723 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 3f73a185ad..0e52725e03 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 50a8313ffd..0ad3c39ccd 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index c47e2fd170..412d69a73d 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "幫助"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "個人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "è¨å®š"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "用戶"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "軟件"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管ç†"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index b9e2346a6f..9957cf25e6 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index f619852c77..8950dc88a4 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index e3de472e4e..75282bcc70 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr "去年"
msgid "years ago"
msgstr "幾年å‰"
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "好"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "é¸æ“‡"
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "é¸æ“‡"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "å¦"
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 81e77b9fbc..6e4b9226e9 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index e8d127b21b..4d01dbe44f 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 10:20+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 8482968091..8da3c5805c 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 02:40+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 1a24751151..e98bbee141 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-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 71930d80bc..f4ee7ce21d 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "說明"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "個人"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr "è¨å®š"
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "使用者"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr "應用程å¼"
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "管ç†"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP 下載已關閉。"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr "檔案需è¦é€ä¸€ä¸‹è¼‰ã€‚"
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr "回到檔案列表"
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr "é¸æ“‡çš„檔案太大以致於無法產生壓縮檔。"
@@ -113,72 +113,76 @@ msgstr "%s 資料庫å稱ä¸èƒ½åŒ…å«å°æ•¸é»ž"
msgid "%s set the database host."
msgstr "%s è¨å®šè³‡æ–™åº«ä¸»æ©Ÿã€‚"
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL 用戶åå’Œ/或密碼無效"
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr "æ‚¨å¿…é ˆè¼¸å…¥ä¸€å€‹ç¾æœ‰çš„帳號或管ç†å“¡å¸³è™Ÿã€‚"
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle 用戶åå’Œ/或密碼無效"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr "MySQL 用戶åå’Œ/或密碼無效"
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr "資料庫錯誤：\"%s\""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr "有å•é¡Œçš„指令是：\"%s\""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr "MySQL 使用者 '%s'@'localhost' 已經å˜åœ¨ã€‚"
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr "在 MySQL 移除這個使用者"
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr "MySQL 使用者 '%s'@'%%' 已經å˜åœ¨"
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr "在 MySQL 移除這個使用者。"
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle 用戶åå’Œ/或密碼無效"
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "有å•é¡Œçš„指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 使用者和/或密碼無效：%s"
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的網é 伺æœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”案åŒæ¥ï¼Œå› 為您的 WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚"
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "è«‹åƒè€ƒ<a href='%s'>安è£æŒ‡å—</a>。"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index dca33e8dbc..cad92c61bf 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:15+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index bfa71664a2..b6739a2934 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-18 01:58+0200\n"
-"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"PO-Revision-Date: 2013-05-23 23:16+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 98b9608ce0..22c934e238 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "اØذ٠اسم المستخدم هذا من الـ MySQL",
"MySQL user '%s'@'%%' already exists" => "أسم المستخدم '%s'@'%%' الخاص بـ MySQL موجود مسبقا",
"Drop this user from MySQL." => "اØذ٠اسم المستخدم هذا من الـ MySQL.",
+"Oracle username and/or password not valid" => "اسم المستخدم Ùˆ/أو كلمة المرور لنظام Oracle غير صØÙŠØ",
"Offending command was: \"%s\", name: %s, password: %s" => "الأمر المخال٠كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
"MS SQL username and/or password not valid: %s" => "اسم المستخدم Ùˆ/أو كلمة المرور لنظام MS SQL غير صØÙŠØ : %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صØÙŠØØ© بشكل ØªØ³Ù…Ø Ù„Ùƒ بمزامنة ملÙاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 73a7fdce48..2de4c0a6e6 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -23,13 +23,13 @@
"%s you may not use dots in the database name" => "%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\"",
"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.",
+"Oracle username and/or password not valid" => "Ðевалидно Oracle потребителÑко име и/или парола",
"MS SQL username and/or password not valid: %s" => "Ðевалидно MS SQL потребителÑко име и/или парола: %s",
"Please double check the <a href='%s'>installation guides</a>." => "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ повторна Ñправка Ñ <a href='%s'>ръководÑтвото за инÑталиране</a>.",
"seconds ago" => "преди Ñекунди",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 028bf2343a..d431fd7207 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s establiu l'ordinador central de la base de dades.",
"PostgreSQL username and/or password not valid" => "Nom d'usuari i/o contrasenya PostgreSQL no và lids",
"You need to enter either an existing account or the administrator." => "Heu d'escriure un compte existent o el d'administrador.",
-"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no và lids",
"MySQL username and/or password not valid" => "Nom d'usuari i/o contrasenya MySQL no và lids",
"DB Error: \"%s\"" => "Error DB: \"%s\"",
"Offending command was: \"%s\"" => "L'ordre en conflicte és: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Elimina aquest usuari de MySQL",
"MySQL user '%s'@'%%' already exists" => "L'usuari MySQL '%s'@'%%' ja existeix",
"Drop this user from MySQL." => "Elimina aquest usuari de MySQL.",
+"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no và lids",
"Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
"MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no và lids: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfÃcie WebDAV sembla no funcionar correctament.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index e3007f687d..36469507d4 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -24,7 +24,6 @@
"%s set the database host." => "Zadejte název poÄÃtaÄe s databázà %s.",
"PostgreSQL username and/or password not valid" => "Uživatelské jméno, Äi heslo PostgreSQL nenà platné",
"You need to enter either an existing account or the administrator." => "MusÃte zadat existujÃcà úÄet, Äi správce.",
-"Oracle username and/or password not valid" => "Uživatelské jméno, Äi heslo Oracle nenà platné",
"MySQL username and/or password not valid" => "Uživatelské jméno, Äi heslo MySQL nenà platné",
"DB Error: \"%s\"" => "Chyba DB: \"%s\"",
"Offending command was: \"%s\"" => "PodezÅ™elý pÅ™Ãkaz byl: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Zahodit uživatele z MySQL",
"MySQL user '%s'@'%%' already exists" => "Uživatel '%s'@'%%' již v MySQL existuje",
"Drop this user from MySQL." => "Zahodit uživatele z MySQL.",
+"Oracle username and/or password not valid" => "Uživatelské jméno, Äi heslo Oracle nenà platné",
"Offending command was: \"%s\", name: %s, password: %s" => "PodezÅ™elý pÅ™Ãkaz byl: \"%s\", jméno: %s, heslo: %s",
"MS SQL username and/or password not valid: %s" => "Uživatelské jméno, Äi heslo MSSQL nenà platné: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nenà správně nastaven pro umožněnà synchronizace, protože rozhranà WebDAV je rozbité.",
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index ab5623bbf4..b3503dcc57 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s gosod gwesteiwr y gronfa ddata.",
"PostgreSQL username and/or password not valid" => "Enw a/neu gyfrinair PostgreSQL annilys",
"You need to enter either an existing account or the administrator." => "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
-"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
"MySQL username and/or password not valid" => "Enw a/neu gyfrinair MySQL annilys",
"DB Error: \"%s\"" => "Gwall DB: \"%s\"",
"Offending command was: \"%s\"" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Gollwng y defnyddiwr hwn o MySQL",
"MySQL user '%s'@'%%' already exists" => "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli",
"Drop this user from MySQL." => "Gollwng y defnyddiwr hwn o MySQL.",
+"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
"Offending command was: \"%s\", name: %s, password: %s" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
"MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index dad64700e5..aead17f510 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s sæt database værten.",
"PostgreSQL username and/or password not valid" => "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
"You need to enter either an existing account or the administrator." => "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
-"Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
"MySQL username and/or password not valid" => "MySQL brugernavn og/eller kodeord er ikke gyldigt.",
"DB Error: \"%s\"" => "Databasefejl: \"%s\"",
"Offending command was: \"%s\"" => "Fejlende kommando var: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Slet denne bruger fra MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.",
"Drop this user from MySQL." => "Slet denne bruger fra MySQL",
+"Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
"Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 13acc1c55b..74715bc66e 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -24,7 +24,6 @@
"%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." => "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\"",
"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
@@ -32,6 +31,7 @@
"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 aus MySQL.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %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.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 566e98b85c..d93f9e4de9 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -24,7 +24,6 @@
"%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.",
-"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\"",
"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
@@ -32,6 +31,7 @@
"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 aus MySQL.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %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 eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 14b63a8184..8637b8da26 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "ΑπόÏÏιψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη από την MySQL",
"MySQL user '%s'@'%%' already exists" => "Ο χÏήστης '%s'@'%%' της MySQL υπάÏχει ήδη",
"Drop this user from MySQL." => "ΑπόÏÏιψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη από την MySQL",
+"Oracle username and/or password not valid" => "Μη ÎγκυÏος χÏήστης και/ή συνθηματικό της Oracle",
"Offending command was: \"%s\", name: %s, password: %s" => "Η εντολη παÏαβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
"MS SQL username and/or password not valid: %s" => "Το όνομα χÏήστη και/ή ο κωδικός της MS SQL δεν είναι ÎγκυÏα: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν Îχει Ïυθμιστεί κατάλληλα ώστε να επιτÏÎπει τον συγχÏονισμό αÏχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστÏαμμÎνη.",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index af96e693d1..fa95089a61 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s ingresar el host de la base de datos.",
"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
"DB Error: \"%s\"" => "Error BD: \"%s\"",
"Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Eliminar este usuario de MySQL",
"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
"Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
+"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
"Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
"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.",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index e9da37e0a3..1df1b16de6 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"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",
+"Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
"Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %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.",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index a4423343ce..2e25f1aa71 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s määra andmebaasi server.",
"PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
"You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
-"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
"MySQL username and/or password not valid" => "MySQL kasutajatunnus ja/või parool pole õiged",
"DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
"Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Kustuta see kasutaja MySQL-ist",
"MySQL user '%s'@'%%' already exists" => "MySQL kasutaja '%s'@'%%' on juba olemas",
"Drop this user from MySQL." => "Kustuta see kasutaja MySQL-ist.",
+"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
"Offending command was: \"%s\", name: %s, password: %s" => "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 934a4d19ab..05b68b062c 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s sartu datu basearen hostalaria.",
"PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
"You need to enter either an existing account or the administrator." => "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
-"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
"MySQL username and/or password not valid" => "MySQL erabiltzaile edota pasahitza ez dira egokiak.",
"DB Error: \"%s\"" => "DB errorea: \"%s\"",
"Offending command was: \"%s\"" => "Errorea komando honek sortu du: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Ezabatu erabiltzaile hau MySQLtik",
"MySQL user '%s'@'%%' already exists" => "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da",
"Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
+"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
"Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index c2e83f6616..0caa7b12df 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -22,13 +22,14 @@
"%s enter the database name." => "%s anna tietokannan nimi.",
"%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
"PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
+"Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
"MySQL username and/or password not valid" => "MySQL:n käyttäjätunnus ja/tai salasana on väärin",
"DB Error: \"%s\"" => "Tietokantavirhe: \"%s\"",
"MySQL user '%s'@'localhost' exists already." => "MySQL-käyttäjä '%s'@'localhost' on jo olemassa.",
"Drop this user from MySQL" => "Pudota tämä käyttäjä MySQL:stä",
"MySQL user '%s'@'%%' already exists" => "MySQL-käyttäjä '%s'@'%%' on jo olemassa",
"Drop this user from MySQL." => "Pudota tämä käyttäjä MySQL:stä.",
+"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
"MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
"seconds ago" => "sekuntia sitten",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index c0920179db..af4efc2b63 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s spécifiez l'hôte de la base de données.",
"PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
"You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
-"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
"MySQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide",
"DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"",
"Offending command was: \"%s\"" => "La requête en cause est : \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Retirer cet utilisateur de la base MySQL",
"MySQL user '%s'@'%%' already exists" => "L'utilisateur MySQL '%s'@'%%' existe déjà ",
"Drop this user from MySQL." => "Retirer cet utilisateur de la base MySQL.",
+"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
"Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
"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.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 783826508c..96b083821d 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -24,7 +24,6 @@
"%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 de 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 de Oracle incorrecto",
"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
@@ -32,6 +31,7 @@
"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.",
+"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %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.",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 841020183b..de63ae3fad 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s adja meg az adatbázist szolgáltató számÃtógép nevét.",
"PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
"You need to enter either an existing account or the administrator." => "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
-"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
"MySQL username and/or password not valid" => "A MySQL felhasználói név és/vagy jelszó érvénytelen",
"DB Error: \"%s\"" => "Adatbázis hiba: \"%s\"",
"Offending command was: \"%s\"" => "A hibát ez a parancs okozta: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Törölje ezt a felhasználót a MySQL-ből",
"MySQL user '%s'@'%%' already exists" => "A '%s'@'%%' MySQL felhasználó már létezik",
"Drop this user from MySQL." => "Törölje ezt a felhasználót a MySQL-ből.",
+"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
"Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelÅ‘en beállÃtva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 54b46cd896..29843a9532 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s setel host basis data.",
"PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
"You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
-"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
"MySQL username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL tidak valid",
"DB Error: \"%s\"" => "Galat Basis Data: \"%s\"",
"Offending command was: \"%s\"" => "Perintah yang bermasalah: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Hapus pengguna ini dari MySQL",
"MySQL user '%s'@'%%' already exists" => "Pengguna MySQL '%s'@'%%' sudah ada.",
"Drop this user from MySQL." => "Hapus pengguna ini dari MySQL.",
+"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
"Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
"MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak valid: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 1db48dbc80..db26ac82ae 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s imposta l'host del database.",
"PostgreSQL username and/or password not valid" => "Nome utente e/o password di PostgreSQL non validi",
"You need to enter either an existing account or the administrator." => "È necessario inserire un account esistente o l'amministratore.",
-"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
+"Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
"MySQL username and/or password not valid" => "Nome utente e/o password di MySQL non validi",
"DB Error: \"%s\"" => "Errore DB: \"%s\"",
"Offending command was: \"%s\"" => "Il comando non consentito era: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Elimina questo utente da MySQL",
"MySQL user '%s'@'%%' already exists" => "L'utente MySQL '%s'@'%%' esiste già ",
"Drop this user from MySQL." => "Elimina questo utente da MySQL.",
+"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
"Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
"MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 3b97ffc431..0e856b0497 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -24,7 +24,6 @@
"%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\"" => "DBエラー: \"%s\"",
"Offending command was: \"%s\"" => "é•åコマンド: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除",
"MySQL user '%s'@'%%' already exists" => "MySQLã®ãƒ¦ãƒ¼ã‚¶ '%s'@'%%' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚",
"Drop this user from MySQL." => "MySQLã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’削除ã™ã‚‹ã€‚",
+"Oracle username and/or password not valid" => "Oracleã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘スワードã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"Offending command was: \"%s\", name: %s, password: %s" => "é•åコマンド: \"%s\"ã€åå‰: %sã€ãƒ‘スワード: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL サーãƒãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å/パスワードãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBサーãƒã¯ã¾ã ファイルã®åŒæœŸã‚’許å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“。",
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index a55323832e..93835e4ead 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -24,7 +24,6 @@
"%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\"" => "DB შეცდáƒáƒ›áƒ: \"%s\"",
"Offending command was: \"%s\"" => "Offending ბრძáƒáƒœáƒ”ბრიყáƒ: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "წáƒáƒ¨áƒáƒšáƒ” ეს მáƒáƒ›áƒ®áƒáƒ›áƒ ებელი MySQL–იდáƒáƒœ",
"MySQL user '%s'@'%%' already exists" => "MySQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი '%s'@'%%' უკვე áƒáƒ სებáƒáƒ‘ს",
"Drop this user from MySQL." => "წáƒáƒ¨áƒáƒšáƒ” ეს მáƒáƒ›áƒ®áƒáƒ›áƒ ებელი MySQL–იდáƒáƒœ",
+"Oracle username and/or password not valid" => "Oracle იუზერნეიმი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის სწáƒáƒ ი",
"Offending command was: \"%s\", name: %s, password: %s" => "Offending ბრძáƒáƒœáƒ”ბრიყáƒ: \"%s\", სáƒáƒ®áƒ”ლი: %s, პáƒáƒ áƒáƒšáƒ˜: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი დáƒ/áƒáƒœ პáƒáƒ áƒáƒšáƒ˜ áƒáƒ áƒáƒ ის მáƒáƒ თებული: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი áƒáƒ áƒáƒ ის კáƒáƒœáƒ¤áƒ˜áƒ’ურირებული ფáƒáƒ˜áƒš სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის, რáƒáƒ“გáƒáƒœ WebDAV ინტერფეისი შეიძლებრიყáƒáƒ¡ გáƒáƒ¢áƒ”ხილი.",
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 28b96c56e1..140c75af3c 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s iestatiet datubÄžu serveri.",
"PostgreSQL username and/or password not valid" => "Nav derÄ«ga PostgreSQL parole un/vai lietotÄjvÄrds",
"You need to enter either an existing account or the administrator." => "Jums jÄievada vai nu esoÅ¡s vai administratora konts.",
-"Oracle username and/or password not valid" => "Nav derÄ«ga Oracle parole un/vai lietotÄjvÄrds",
"MySQL username and/or password not valid" => "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds",
"DB Error: \"%s\"" => "DB kļūda — “%sâ€",
"Offending command was: \"%s\"" => "VainÄ«gÄ komanda bija “%sâ€",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Izmest Å¡o lietotÄju no MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL lietotÄjs '%s'@'%%' jau eksistÄ“",
"Drop this user from MySQL." => "Izmest Å¡o lietotÄju no MySQL.",
+"Oracle username and/or password not valid" => "Nav derÄ«ga Oracle parole un/vai lietotÄjvÄrds",
"Offending command was: \"%s\", name: %s, password: %s" => "VainÄ«gÄ komanda bija \"%s\", vÄrds: %s, parole: %s",
"MS SQL username and/or password not valid: %s" => "Nav derÄ«ga MySQL parole un/vai lietotÄjvÄrds — %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai ļautu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta.",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 0c38714261..7340591e9a 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s instellen databaseservernaam.",
"PostgreSQL username and/or password not valid" => "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
"You need to enter either an existing account or the administrator." => "Geef of een bestaand account op of het beheerdersaccount.",
-"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
"MySQL username and/or password not valid" => "MySQL gebruikersnaam en/of wachtwoord ongeldig",
"DB Error: \"%s\"" => "DB Fout: \"%s\"",
"Offending command was: \"%s\"" => "Onjuiste commande was: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Verwijder deze gebruiker uit MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al",
"Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.",
+"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
"Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 4ac1c14439..de15964b13 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s ustaw hosta bazy danych.",
"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
"You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub administratora.",
-"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
"MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
"DB Error: \"%s\"" => "BÅ‚Ä…d DB: \"%s\"",
"Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Usuń tego użytkownika z MySQL",
"MySQL user '%s'@'%%' already exists" => "Użytkownik MySQL '%s'@'%%t' już istnieje",
"Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
+"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
"Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s",
"MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 4c50f8de9e..9606477d94 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s defina o host do banco de dados.",
"PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
"You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou o administrador.",
-"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
+"Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
"MySQL username and/or password not valid" => "Nome de usuário e/ou senha MySQL inválido(s)",
"DB Error: \"%s\"" => "Erro no BD: \"%s\"",
"Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Derrubar este usuário do MySQL",
"MySQL user '%s'@'%%' already exists" => "Usuário MySQL '%s'@'%%' já existe",
"Drop this user from MySQL." => "Derrube este usuário do MySQL.",
+"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
"Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index b3befe96e0..176f4286c9 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -24,7 +24,6 @@
"%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/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\"",
@@ -32,6 +31,7 @@
"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",
+"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %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.",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index e716f6d1c1..e077b688c0 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Удалить Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL",
"MySQL user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует",
"Drop this user from MySQL." => "Удалить Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· MySQL.",
+"Oracle username and/or password not valid" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle",
"Offending command was: \"%s\", name: %s, password: %s" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\", имÑ: %s, пароль: %s",
"MS SQL username and/or password not valid: %s" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MS SQL не подходит: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV.",
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index 8fb568aee7..7639a3cc97 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Settings" => "ÐаÑтройки"
+"Settings" => "ÐаÑтройки",
+"Text" => "ТекÑÑ‚"
);
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index e074ed78c3..121b2405dc 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -24,7 +24,6 @@
"%s set the database host." => "Zadajte názov poÄÃtaÄa s databázou %s.",
"PostgreSQL username and/or password not valid" => "PoužÃvateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
"You need to enter either an existing account or the administrator." => "MusÃte zadaÅ¥ jestvujúci úÄet alebo administrátora.",
-"Oracle username and/or password not valid" => "PoužÃvateľské meno a/alebo heslo pre Oracle databázu je neplatné",
"MySQL username and/or password not valid" => "PoužÃvateľské meno a/alebo heslo pre MySQL databázu je neplatné",
"DB Error: \"%s\"" => "Chyba DB: \"%s\"",
"Offending command was: \"%s\"" => "Podozrivý prÃkaz bol: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "ZahodiÅ¥ použÃvateľa z MySQL.",
"MySQL user '%s'@'%%' already exists" => "PoužÃvateľ '%s'@'%%' už v MySQL existuje",
"Drop this user from MySQL." => "ZahodiÅ¥ použÃvateľa z MySQL.",
+"Oracle username and/or password not valid" => "PoužÃvateľské meno a/alebo heslo pre Oracle databázu je neplatné",
"Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý prÃkaz bol: \"%s\", meno: %s, heslo: %s",
"MS SQL username and/or password not valid: %s" => "PoužÃvateľské meno, alebo heslo MS SQL nie je platné: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 0c42f44d2a..7f8827d17f 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s - vnos gostitelja podatkovne zbirke.",
"PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
"You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstojeÄi ali pa skrbniÅ¡ki raÄun.",
-"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
"MySQL username and/or password not valid" => "Uporabniško ime ali geslo MySQL ni veljavno",
"DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"",
"Offending command was: \"%s\"" => "NapaÄni ukaz je: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Odstrani uporabnika s podatkovne zbirke MySQL",
"MySQL user '%s'@'%%' already exists" => "Uporabnik MySQL '%s'@'%%' že obstaja.",
"Drop this user from MySQL." => "Odstrani uporabnika s podatkovne zbirke MySQL",
+"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
"Offending command was: \"%s\", name: %s, password: %s" => "NapaÄni ukaz je: \"%s\", ime: %s, geslo: %s",
"MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena.",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index 60d83ca48c..04186f6210 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s caktoni pozicionin (host) e database-it.",
"PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
"You need to enter either an existing account or the administrator." => "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
-"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
"MySQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm.",
"DB Error: \"%s\"" => "Veprim i gabuar i DB-it: \"%s\"",
"Offending command was: \"%s\"" => "Komanda e gabuar ishte: \"%s\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Eliminoni këtë përdorues nga MySQL",
"MySQL user '%s'@'%%' already exists" => "Përdoruesi MySQL '%s'@'%%' ekziston",
"Drop this user from MySQL." => "Eliminoni këtë përdorues nga MySQL.",
+"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
"Offending command was: \"%s\", name: %s, password: %s" => "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
"MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 641da2447e..7996447b95 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -24,7 +24,6 @@
"%s set the database host." => "%s veritabanı sunucu adını tanımla",
"PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
"You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ",
-"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. ",
"MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli değil",
"DB Error: \"%s\"" => "DB Hata: ''%s''",
"Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Bu kullanici MySQLden list disari koymak. ",
"MySQL user '%s'@'%%' already exists" => "MySQL kullanici '%s @ % % zaten var (zaten yazili)",
"Drop this user from MySQL." => "Bu kulanıcıyı MySQL veritabanından kaldır",
+"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. ",
"Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index a544890124..676879629e 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "Видалити цього кориÑтувача з MySQL",
"MySQL user '%s'@'%%' already exists" => "КориÑтувач MySQL '%s'@'%%' вже Ñ–Ñнує",
"Drop this user from MySQL." => "Видалити цього кориÑтувача з MySQL.",
+"Oracle username and/or password not valid" => "Oracle ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні",
"Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'Ñ: %s, пароль: %s",
"MS SQL username and/or password not valid: %s" => "MS SQL ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача та/або пароль не дійÑні: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-Ñервер ще не налаштований належним чином Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб дозволити Ñинхронізацію файлів, через те що Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, здаєтьÑÑ, зламаний.",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index cab5142e5d..61e405d805 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "建议从 MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·",
"MySQL user '%s'@'%%' already exists" => "MySQL 用户 '%s'@'%%' å·²å˜åœ¨",
"Drop this user from MySQL." => "建议从 MySQL æ•°æ®åº“ä¸ä¸¢å¼ƒ Drop æ¤ç”¨æˆ·ã€‚",
+"Oracle username and/or password not valid" => "Oracle æ•°æ®åº“用户åå’Œ/或密ç æ— æ•ˆ",
"Offending command was: \"%s\", name: %s, password: %s" => "冲çªå‘½ä»¤ä¸ºï¼š\"%s\"，å称：%s，密ç ：%s",
"MS SQL username and/or password not valid: %s" => "MS SQL 用户åå’Œ/或密ç æ— æ•ˆï¼š%s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…许文件åŒæ¥, å› ä¸ºWebDAV的接å£ä¼¼ä¹Žå·²æŸå.",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 5affb1ccf3..ec7310d4e4 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -24,7 +24,6 @@
"%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\"",
@@ -32,6 +31,7 @@
"Drop this user from MySQL" => "在 MySQL 移除這個使用者",
"MySQL user '%s'@'%%' already exists" => "MySQL 使用者 '%s'@'%%' 已經å˜åœ¨",
"Drop this user from MySQL." => "在 MySQL 移除這個使用者。",
+"Oracle username and/or password not valid" => "Oracle 用戶åå’Œ/或密碼無效",
"Offending command was: \"%s\", name: %s, password: %s" => "有å•é¡Œçš„指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
"MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網é 伺æœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”案åŒæ¥ï¼Œå› 為您的 WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 6f7db02781..d816f9fe85 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
"Error" => "Ошибка",
-"deleted" => "удалено"
+"deleted" => "удалено",
+"Groups" => "Группы",
+"Delete" => "Удалить",
+"Email" => "Email",
+"Other" => "Другое"
);
--
GitLab
From 3fbfe3c06a46f442c588daf037c997da658d3526 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Thu, 23 May 2013 20:59:02 -0400
Subject: [PATCH 298/304] small typo in the comments
---
lib/connector/sabre/node.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 360c3066d0..1ffa048d6b 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -101,7 +101,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
/**
* @brief Ensure that the fileinfo cache is filled
- & @note Uses OC_FileCache or a direct stat
+ * @note Uses OC_FileCache or a direct stat
*/
protected function getFileinfoCache() {
if (!isset($this->fileinfo_cache)) {
--
GitLab
From a753d14de91f02a418b6658fc72104b21b60b92b Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 24 May 2013 15:19:13 +0200
Subject: [PATCH 299/304] adding Oracle support to autotest.sh
---
autotest.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 55 insertions(+), 4 deletions(-)
diff --git a/autotest.sh b/autotest.sh
index 267815e96d..0c59ee51a0 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -54,6 +54,22 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
);
DELIM
+cat > ./tests/autoconfig-oci.php <<DELIM
+<?php
+\$AUTOCONFIG = array (
+ 'installed' => false,
+ 'dbtype' => 'oci',
+ 'dbtableprefix' => 'oc_',
+ 'adminlogin' => 'admin',
+ 'adminpass' => 'admin',
+ 'directory' => '$BASEDIR/$DATADIR',
+ 'dbuser' => 'oc_autotest',
+ 'dbname' => 'XE',
+ 'dbhost' => 'localhost',
+ 'dbpass' => 'owncloud',
+);
+DELIM
+
function execute_tests {
echo "Setup environment for $1 testing ..."
# back to root folder
@@ -77,6 +93,30 @@ function execute_tests {
if [ "$1" == "pgsql" ] ; then
dropdb -U oc_autotest oc_autotest
fi
+ if [ "$1" == "oci" ] ; then
+ echo "drop the database"
+ sqlplus -s -l / as sysdba <<EOF
+ drop user oc_autotest cascade;
+EOF
+
+ echo "create the database"
+ sqlplus -s -l / as sysdba <<EOF
+ create user oc_autotest identified by owncloud;
+ alter user oc_autotest default tablespace users
+ temporary tablespace temp
+ quota unlimited on users;
+ grant create session
+ , create table
+ , create procedure
+ , create sequence
+ , create trigger
+ , create view
+ , create synonym
+ , alter session
+ to oc_autotest;
+ exit;
+EOF
+ fi
# copy autoconfig
cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
@@ -101,9 +141,16 @@ function execute_tests {
#
# start test execution
#
-execute_tests "sqlite"
-execute_tests 'mysql'
-execute_tests 'pgsql'
+if [ -z "$1" ]
+ then
+ execute_tests "sqlite"
+ execute_tests 'mysql'
+ execute_tests 'pgsql'
+ # we will add oci as soon as it's stable
+ #execute_tests 'oci'
+else
+ execute_tests $1
+fi
#
# NOTES on mysql:
@@ -116,4 +163,8 @@ execute_tests 'pgsql'
# - 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 oci:
+# - it's a pure nightmare to install Oracle on a Linux-System
+# - DON'T TRY THIS AT HOME!
+# - if you really need it: we feel sorry for you
+#
--
GitLab
From f56802a437e47deae84cbd5a337620d79dbae34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 24 May 2013 18:37:58 +0200
Subject: [PATCH 300/304] no use the recoveryPassword var instead of accessing
the POST array
---
apps/files_encryption/lib/helper.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 43f573c16b..7a2d19eed5 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -146,7 +146,7 @@ class Helper
} else { // get recovery key and check the password
$util = new \OCA\Encryption\Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
- $return = $util->checkRecoveryPassword( $_POST['recoveryPassword'] );
+ $return = $util->checkRecoveryPassword( $recoveryPassword );
if ( $return ) {
\OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
}
--
GitLab
From 1f9ac7850d7cc992b712fa99fd3d4f92a219f9d8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 24 May 2013 21:50:34 +0200
Subject: [PATCH 301/304] meanwhile phpunit is seq faulting with mysql as well
---
autotest.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/autotest.sh b/autotest.sh
index 0c59ee51a0..4562b3ed08 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -130,11 +130,11 @@ EOF
rm -rf coverage-html-$1
mkdir coverage-html-$1
php -f enable_all.php
- if [ "$1" == "pgsql" ] ; then
- # no coverage with pg - causes segfault on ci.tmit.eu - reason unknown
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
- else
+ if [ "$1" == "sqlite" ] ; then
+ # coverage only with sqlite - causes segfault on ci.tmit.eu - reason unknown
phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+ else
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
fi
}
--
GitLab
From b32823a96e16c3d30beb9db87a3bbad9615ef80d Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 24 May 2013 21:35:18 +0200
Subject: [PATCH 302/304] improved trashbin test
---
apps/files_encryption/tests/trashbin.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index b62041a6d3..c317c024ea 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -235,7 +235,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
$trashFileSuffix = null;
// find created file with timestamp
foreach($trashFiles as $file) {
- if(strncmp($file['path'], $filename, strlen($filename))) {
+ if(strncmp($file['name'], $filename, strlen($filename)) == 0) {
$path_parts = pathinfo($file['name']);
$trashFileSuffix = $path_parts['extension'];
}
--
GitLab
From fba7200b05c54a20f009b501744dd1074afceec5 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Fri, 24 May 2013 22:01:27 +0200
Subject: [PATCH 303/304] improved trashbin test again
---
apps/files_encryption/tests/trashbin.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index c317c024ea..cc8709b6f2 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -238,6 +238,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
if(strncmp($file['name'], $filename, strlen($filename)) == 0) {
$path_parts = pathinfo($file['name']);
$trashFileSuffix = $path_parts['extension'];
+ break;
}
}
--
GitLab
From 6a6c18dfab494324d5fa7c2ea7a299830dd79612 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 25 May 2013 02:11:52 +0200
Subject: [PATCH 304/304] [tx-robot] updated from transifex
---
apps/files/l10n/ca.php | 2 +-
apps/files_encryption/l10n/ar.php | 6 +-
apps/files_encryption/l10n/bg_BG.php | 3 +-
apps/files_encryption/l10n/bn_BD.php | 3 +-
apps/files_encryption/l10n/ca.php | 6 +-
apps/files_encryption/l10n/cs_CZ.php | 6 +-
apps/files_encryption/l10n/cy_GB.php | 6 +-
apps/files_encryption/l10n/da.php | 6 +-
apps/files_encryption/l10n/de.php | 6 +-
apps/files_encryption/l10n/de_DE.php | 6 +-
apps/files_encryption/l10n/el.php | 6 +-
apps/files_encryption/l10n/eo.php | 3 +-
apps/files_encryption/l10n/es.php | 6 +-
apps/files_encryption/l10n/es_AR.php | 6 +-
apps/files_encryption/l10n/et_EE.php | 6 +-
apps/files_encryption/l10n/eu.php | 6 +-
apps/files_encryption/l10n/fa.php | 6 +-
apps/files_encryption/l10n/fi_FI.php | 6 +-
apps/files_encryption/l10n/fr.php | 6 +-
apps/files_encryption/l10n/gl.php | 6 +-
apps/files_encryption/l10n/he.php | 3 +-
apps/files_encryption/l10n/hu_HU.php | 6 +-
apps/files_encryption/l10n/id.php | 6 +-
apps/files_encryption/l10n/is.php | 3 +-
apps/files_encryption/l10n/it.php | 6 +-
apps/files_encryption/l10n/ja_JP.php | 6 +-
apps/files_encryption/l10n/ka_GE.php | 6 +-
apps/files_encryption/l10n/ko.php | 3 +-
apps/files_encryption/l10n/ku_IQ.php | 3 +-
apps/files_encryption/l10n/lt_LT.php | 3 +-
apps/files_encryption/l10n/lv.php | 6 +-
apps/files_encryption/l10n/mk.php | 3 +-
apps/files_encryption/l10n/nb_NO.php | 6 +-
apps/files_encryption/l10n/nl.php | 6 +-
apps/files_encryption/l10n/pl.php | 6 +-
apps/files_encryption/l10n/pt_BR.php | 6 +-
apps/files_encryption/l10n/pt_PT.php | 6 +-
apps/files_encryption/l10n/ro.php | 3 +-
apps/files_encryption/l10n/ru.php | 6 +-
apps/files_encryption/l10n/si_LK.php | 3 +-
apps/files_encryption/l10n/sk_SK.php | 6 +-
apps/files_encryption/l10n/sl.php | 6 +-
apps/files_encryption/l10n/sr.php | 3 +-
apps/files_encryption/l10n/sv.php | 6 +-
apps/files_encryption/l10n/ta_LK.php | 3 +-
apps/files_encryption/l10n/th_TH.php | 3 +-
apps/files_encryption/l10n/tr.php | 6 +-
apps/files_encryption/l10n/ug.php | 6 +-
apps/files_encryption/l10n/uk.php | 6 +-
apps/files_encryption/l10n/vi.php | 6 +-
apps/files_encryption/l10n/zh_CN.GB2312.php | 3 +-
apps/files_encryption/l10n/zh_CN.php | 6 +-
apps/files_encryption/l10n/zh_HK.php | 5 +-
apps/files_encryption/l10n/zh_TW.php | 6 +-
apps/files_trashbin/l10n/bg_BG.php | 3 +-
apps/files_trashbin/l10n/id.php | 8 +-
apps/files_trashbin/l10n/pl.php | 4 +-
apps/files_trashbin/l10n/pt_PT.php | 2 +-
apps/files_trashbin/l10n/ro.php | 1 +
apps/files_trashbin/l10n/sk_SK.php | 2 +-
apps/user_ldap/l10n/es.php | 38 +-
apps/user_ldap/l10n/pl.php | 7 +
core/l10n/ca.php | 1 +
core/l10n/es.php | 1 +
core/l10n/et_EE.php | 1 +
core/l10n/gl.php | 1 +
core/l10n/ja_JP.php | 1 +
core/l10n/pl.php | 1 +
core/l10n/pt_BR.php | 1 +
l10n/af_ZA/core.po | 4 +-
l10n/af_ZA/files.po | 4 +-
l10n/af_ZA/files_encryption.po | 75 +++-
l10n/af_ZA/files_external.po | 4 +-
l10n/af_ZA/files_sharing.po | 4 +-
l10n/af_ZA/files_trashbin.po | 4 +-
l10n/af_ZA/files_versions.po | 4 +-
l10n/af_ZA/lib.po | 4 +-
l10n/af_ZA/settings.po | 52 +--
l10n/af_ZA/user_ldap.po | 4 +-
l10n/af_ZA/user_webdavauth.po | 4 +-
l10n/ar/core.po | 4 +-
l10n/ar/files.po | 4 +-
l10n/ar/files_encryption.po | 83 ++++-
l10n/ar/files_external.po | 4 +-
l10n/ar/files_sharing.po | 4 +-
l10n/ar/files_trashbin.po | 4 +-
l10n/ar/files_versions.po | 4 +-
l10n/ar/lib.po | 4 +-
l10n/ar/settings.po | 42 ++-
l10n/ar/user_ldap.po | 4 +-
l10n/ar/user_webdavauth.po | 10 +-
l10n/be/core.po | 22 +-
l10n/be/files.po | 4 +-
l10n/be/files_encryption.po | 75 +++-
l10n/be/files_external.po | 4 +-
l10n/be/files_sharing.po | 4 +-
l10n/be/files_trashbin.po | 4 +-
l10n/be/files_versions.po | 4 +-
l10n/be/lib.po | 68 ++--
l10n/be/settings.po | 64 ++--
l10n/be/user_ldap.po | 4 +-
l10n/be/user_webdavauth.po | 4 +-
l10n/bg_BG/core.po | 4 +-
l10n/bg_BG/files.po | 4 +-
l10n/bg_BG/files_encryption.po | 77 +++-
l10n/bg_BG/files_external.po | 4 +-
l10n/bg_BG/files_sharing.po | 4 +-
l10n/bg_BG/files_trashbin.po | 4 +-
l10n/bg_BG/files_versions.po | 4 +-
l10n/bg_BG/lib.po | 4 +-
l10n/bg_BG/settings.po | 42 ++-
l10n/bg_BG/user_ldap.po | 4 +-
l10n/bg_BG/user_webdavauth.po | 4 +-
l10n/bn_BD/core.po | 4 +-
l10n/bn_BD/files.po | 4 +-
l10n/bn_BD/files_encryption.po | 77 +++-
l10n/bn_BD/files_external.po | 4 +-
l10n/bn_BD/files_sharing.po | 4 +-
l10n/bn_BD/files_trashbin.po | 4 +-
l10n/bn_BD/files_versions.po | 4 +-
l10n/bn_BD/lib.po | 4 +-
l10n/bn_BD/settings.po | 42 ++-
l10n/bn_BD/user_ldap.po | 4 +-
l10n/bn_BD/user_webdavauth.po | 6 +-
l10n/ca/core.po | 7 +-
l10n/ca/files.po | 6 +-
l10n/ca/files_encryption.po | 85 ++++-
l10n/ca/files_external.po | 4 +-
l10n/ca/files_sharing.po | 4 +-
l10n/ca/files_trashbin.po | 4 +-
l10n/ca/files_versions.po | 4 +-
l10n/ca/lib.po | 4 +-
l10n/ca/settings.po | 44 +--
l10n/ca/user_ldap.po | 4 +-
l10n/ca/user_webdavauth.po | 6 +-
l10n/cs_CZ/core.po | 4 +-
l10n/cs_CZ/files.po | 4 +-
l10n/cs_CZ/files_encryption.po | 83 ++++-
l10n/cs_CZ/files_external.po | 4 +-
l10n/cs_CZ/files_sharing.po | 4 +-
l10n/cs_CZ/files_trashbin.po | 4 +-
l10n/cs_CZ/files_versions.po | 4 +-
l10n/cs_CZ/lib.po | 4 +-
l10n/cs_CZ/settings.po | 42 ++-
l10n/cs_CZ/user_ldap.po | 4 +-
l10n/cs_CZ/user_webdavauth.po | 6 +-
l10n/cy_GB/core.po | 4 +-
l10n/cy_GB/files.po | 4 +-
l10n/cy_GB/files_encryption.po | 85 ++++-
l10n/cy_GB/files_external.po | 4 +-
l10n/cy_GB/files_sharing.po | 4 +-
l10n/cy_GB/files_trashbin.po | 4 +-
l10n/cy_GB/files_versions.po | 4 +-
l10n/cy_GB/lib.po | 4 +-
l10n/cy_GB/settings.po | 42 ++-
l10n/cy_GB/user_ldap.po | 4 +-
l10n/cy_GB/user_webdavauth.po | 4 +-
l10n/da/core.po | 4 +-
l10n/da/files.po | 4 +-
l10n/da/files_encryption.po | 83 ++++-
l10n/da/files_external.po | 4 +-
l10n/da/files_sharing.po | 4 +-
l10n/da/files_trashbin.po | 4 +-
l10n/da/files_versions.po | 4 +-
l10n/da/lib.po | 4 +-
l10n/da/settings.po | 44 +--
l10n/da/user_ldap.po | 4 +-
l10n/da/user_webdavauth.po | 8 +-
l10n/de/core.po | 4 +-
l10n/de/files.po | 4 +-
l10n/de/files_encryption.po | 85 ++++-
l10n/de/files_external.po | 4 +-
l10n/de/files_sharing.po | 4 +-
l10n/de/files_trashbin.po | 4 +-
l10n/de/files_versions.po | 4 +-
l10n/de/lib.po | 4 +-
l10n/de/settings.po | 44 +--
l10n/de/user_ldap.po | 4 +-
l10n/de/user_webdavauth.po | 12 +-
l10n/de_DE/core.po | 4 +-
l10n/de_DE/files.po | 4 +-
l10n/de_DE/files_encryption.po | 85 ++++-
l10n/de_DE/files_external.po | 4 +-
l10n/de_DE/files_sharing.po | 4 +-
l10n/de_DE/files_trashbin.po | 4 +-
l10n/de_DE/files_versions.po | 4 +-
l10n/de_DE/lib.po | 4 +-
l10n/de_DE/settings.po | 44 +--
l10n/de_DE/user_ldap.po | 4 +-
l10n/de_DE/user_webdavauth.po | 14 +-
l10n/el/core.po | 4 +-
l10n/el/files.po | 4 +-
l10n/el/files_encryption.po | 83 ++++-
l10n/el/files_external.po | 4 +-
l10n/el/files_sharing.po | 4 +-
l10n/el/files_trashbin.po | 4 +-
l10n/el/files_versions.po | 4 +-
l10n/el/lib.po | 4 +-
l10n/el/settings.po | 44 +--
l10n/el/user_ldap.po | 4 +-
l10n/el/user_webdavauth.po | 12 +-
l10n/en@pirate/core.po | 22 +-
l10n/en@pirate/files.po | 4 +-
l10n/en@pirate/files_encryption.po | 77 +++-
l10n/en@pirate/files_external.po | 2 +-
l10n/en@pirate/files_sharing.po | 4 +-
l10n/en@pirate/files_trashbin.po | 2 +-
l10n/en@pirate/files_versions.po | 2 +-
l10n/en@pirate/lib.po | 66 ++--
l10n/en@pirate/settings.po | 52 +--
l10n/en@pirate/user_ldap.po | 4 +-
l10n/en@pirate/user_webdavauth.po | 2 +-
l10n/eo/core.po | 4 +-
l10n/eo/files.po | 4 +-
l10n/eo/files_encryption.po | 77 +++-
l10n/eo/files_external.po | 4 +-
l10n/eo/files_sharing.po | 4 +-
l10n/eo/files_trashbin.po | 4 +-
l10n/eo/files_versions.po | 4 +-
l10n/eo/lib.po | 4 +-
l10n/eo/settings.po | 42 ++-
l10n/eo/user_ldap.po | 4 +-
l10n/eo/user_webdavauth.po | 8 +-
l10n/es/core.po | 9 +-
l10n/es/files.po | 4 +-
l10n/es/files_encryption.po | 83 ++++-
l10n/es/files_external.po | 4 +-
l10n/es/files_sharing.po | 4 +-
l10n/es/files_trashbin.po | 4 +-
l10n/es/files_versions.po | 4 +-
l10n/es/lib.po | 9 +-
l10n/es/settings.po | 44 +--
l10n/es/user_ldap.po | 55 +--
l10n/es/user_webdavauth.po | 10 +-
l10n/es_AR/core.po | 4 +-
l10n/es_AR/files.po | 4 +-
l10n/es_AR/files_encryption.po | 83 ++++-
l10n/es_AR/files_external.po | 4 +-
l10n/es_AR/files_sharing.po | 4 +-
l10n/es_AR/files_trashbin.po | 4 +-
l10n/es_AR/files_versions.po | 4 +-
l10n/es_AR/lib.po | 4 +-
l10n/es_AR/settings.po | 44 +--
l10n/es_AR/user_ldap.po | 4 +-
l10n/es_AR/user_webdavauth.po | 10 +-
l10n/et_EE/core.po | 8 +-
l10n/et_EE/files.po | 4 +-
l10n/et_EE/files_encryption.po | 85 ++++-
l10n/et_EE/files_external.po | 4 +-
l10n/et_EE/files_sharing.po | 4 +-
l10n/et_EE/files_trashbin.po | 4 +-
l10n/et_EE/files_versions.po | 4 +-
l10n/et_EE/lib.po | 9 +-
l10n/et_EE/settings.po | 44 +--
l10n/et_EE/user_ldap.po | 4 +-
l10n/et_EE/user_webdavauth.po | 4 +-
l10n/eu/core.po | 4 +-
l10n/eu/files.po | 4 +-
l10n/eu/files_encryption.po | 83 ++++-
l10n/eu/files_external.po | 4 +-
l10n/eu/files_sharing.po | 4 +-
l10n/eu/files_trashbin.po | 4 +-
l10n/eu/files_versions.po | 4 +-
l10n/eu/lib.po | 4 +-
l10n/eu/settings.po | 42 ++-
l10n/eu/user_ldap.po | 4 +-
l10n/eu/user_webdavauth.po | 8 +-
l10n/fa/core.po | 4 +-
l10n/fa/files.po | 4 +-
l10n/fa/files_encryption.po | 83 ++++-
l10n/fa/files_external.po | 4 +-
l10n/fa/files_sharing.po | 4 +-
l10n/fa/files_trashbin.po | 4 +-
l10n/fa/files_versions.po | 4 +-
l10n/fa/lib.po | 4 +-
l10n/fa/settings.po | 42 ++-
l10n/fa/user_ldap.po | 4 +-
l10n/fa/user_webdavauth.po | 4 +-
l10n/fi/core.po | 4 +-
l10n/fi/files.po | 4 +-
l10n/fi/files_encryption.po | 81 ++++-
l10n/fi/files_external.po | 77 ++--
l10n/fi/files_sharing.po | 16 +-
l10n/fi/files_trashbin.po | 84 +++++
l10n/fi/files_versions.po | 45 ++-
l10n/fi/lib.po | 4 +-
l10n/fi/settings.po | 373 ++++++++++++++------
l10n/fi/user_ldap.po | 337 +++++++++++++++---
l10n/fi/user_webdavauth.po | 33 ++
l10n/fi_FI/core.po | 4 +-
l10n/fi_FI/files.po | 4 +-
l10n/fi_FI/files_encryption.po | 83 ++++-
l10n/fi_FI/files_external.po | 4 +-
l10n/fi_FI/files_sharing.po | 4 +-
l10n/fi_FI/files_trashbin.po | 4 +-
l10n/fi_FI/files_versions.po | 4 +-
l10n/fi_FI/lib.po | 4 +-
l10n/fi_FI/settings.po | 44 +--
l10n/fi_FI/user_ldap.po | 4 +-
l10n/fi_FI/user_webdavauth.po | 6 +-
l10n/fr/core.po | 4 +-
l10n/fr/files.po | 4 +-
l10n/fr/files_encryption.po | 83 ++++-
l10n/fr/files_external.po | 4 +-
l10n/fr/files_sharing.po | 4 +-
l10n/fr/files_trashbin.po | 4 +-
l10n/fr/files_versions.po | 4 +-
l10n/fr/lib.po | 4 +-
l10n/fr/settings.po | 44 +--
l10n/fr/user_ldap.po | 4 +-
l10n/fr/user_webdavauth.po | 14 +-
l10n/gl/core.po | 6 +-
l10n/gl/files.po | 4 +-
l10n/gl/files_encryption.po | 83 ++++-
l10n/gl/files_external.po | 4 +-
l10n/gl/files_sharing.po | 4 +-
l10n/gl/files_trashbin.po | 4 +-
l10n/gl/files_versions.po | 4 +-
l10n/gl/lib.po | 9 +-
l10n/gl/settings.po | 44 +--
l10n/gl/user_ldap.po | 4 +-
l10n/gl/user_webdavauth.po | 12 +-
l10n/he/core.po | 4 +-
l10n/he/files.po | 4 +-
l10n/he/files_encryption.po | 77 +++-
l10n/he/files_external.po | 4 +-
l10n/he/files_sharing.po | 4 +-
l10n/he/files_trashbin.po | 4 +-
l10n/he/files_versions.po | 4 +-
l10n/he/lib.po | 4 +-
l10n/he/settings.po | 42 ++-
l10n/he/user_ldap.po | 4 +-
l10n/he/user_webdavauth.po | 4 +-
l10n/hi/core.po | 4 +-
l10n/hi/files.po | 4 +-
l10n/hi/files_encryption.po | 75 +++-
l10n/hi/files_external.po | 4 +-
l10n/hi/files_sharing.po | 4 +-
l10n/hi/files_trashbin.po | 4 +-
l10n/hi/files_versions.po | 4 +-
l10n/hi/lib.po | 4 +-
l10n/hi/settings.po | 52 +--
l10n/hi/user_ldap.po | 4 +-
l10n/hi/user_webdavauth.po | 4 +-
l10n/hr/core.po | 4 +-
l10n/hr/files.po | 4 +-
l10n/hr/files_encryption.po | 75 +++-
l10n/hr/files_external.po | 4 +-
l10n/hr/files_sharing.po | 4 +-
l10n/hr/files_trashbin.po | 4 +-
l10n/hr/files_versions.po | 4 +-
l10n/hr/lib.po | 4 +-
l10n/hr/settings.po | 42 ++-
l10n/hr/user_ldap.po | 4 +-
l10n/hr/user_webdavauth.po | 4 +-
l10n/hu_HU/core.po | 4 +-
l10n/hu_HU/files.po | 4 +-
l10n/hu_HU/files_encryption.po | 83 ++++-
l10n/hu_HU/files_external.po | 4 +-
l10n/hu_HU/files_sharing.po | 4 +-
l10n/hu_HU/files_trashbin.po | 4 +-
l10n/hu_HU/files_versions.po | 4 +-
l10n/hu_HU/lib.po | 4 +-
l10n/hu_HU/settings.po | 44 +--
l10n/hu_HU/user_ldap.po | 4 +-
l10n/hu_HU/user_webdavauth.po | 6 +-
l10n/hy/core.po | 24 +-
l10n/hy/files.po | 4 +-
l10n/hy/files_encryption.po | 81 ++++-
l10n/hy/files_external.po | 2 +-
l10n/hy/files_sharing.po | 2 +-
l10n/hy/files_trashbin.po | 2 +-
l10n/hy/files_versions.po | 45 ++-
l10n/hy/lib.po | 192 ++++++++--
l10n/hy/settings.po | 44 +--
l10n/hy/user_ldap.po | 337 +++++++++++++++---
l10n/hy/user_webdavauth.po | 33 ++
l10n/ia/core.po | 4 +-
l10n/ia/files.po | 4 +-
l10n/ia/files_encryption.po | 75 +++-
l10n/ia/files_external.po | 4 +-
l10n/ia/files_sharing.po | 4 +-
l10n/ia/files_trashbin.po | 4 +-
l10n/ia/files_versions.po | 4 +-
l10n/ia/lib.po | 4 +-
l10n/ia/settings.po | 42 ++-
l10n/ia/user_ldap.po | 4 +-
l10n/ia/user_webdavauth.po | 4 +-
l10n/id/core.po | 4 +-
l10n/id/files.po | 4 +-
l10n/id/files_encryption.po | 83 ++++-
l10n/id/files_external.po | 4 +-
l10n/id/files_sharing.po | 4 +-
l10n/id/files_trashbin.po | 4 +-
l10n/id/files_versions.po | 4 +-
l10n/id/lib.po | 4 +-
l10n/id/settings.po | 42 ++-
l10n/id/user_ldap.po | 4 +-
l10n/id/user_webdavauth.po | 6 +-
l10n/is/core.po | 4 +-
l10n/is/files.po | 4 +-
l10n/is/files_encryption.po | 77 +++-
l10n/is/files_external.po | 4 +-
l10n/is/files_sharing.po | 4 +-
l10n/is/files_trashbin.po | 4 +-
l10n/is/files_versions.po | 4 +-
l10n/is/lib.po | 4 +-
l10n/is/settings.po | 42 ++-
l10n/is/user_ldap.po | 4 +-
l10n/is/user_webdavauth.po | 6 +-
l10n/it/core.po | 4 +-
l10n/it/files.po | 4 +-
l10n/it/files_encryption.po | 85 ++++-
l10n/it/files_external.po | 4 +-
l10n/it/files_sharing.po | 4 +-
l10n/it/files_trashbin.po | 4 +-
l10n/it/files_versions.po | 4 +-
l10n/it/lib.po | 4 +-
l10n/it/settings.po | 44 +--
l10n/it/user_ldap.po | 4 +-
l10n/it/user_webdavauth.po | 4 +-
l10n/ja_JP/core.po | 6 +-
l10n/ja_JP/files.po | 4 +-
l10n/ja_JP/files_encryption.po | 83 ++++-
l10n/ja_JP/files_external.po | 4 +-
l10n/ja_JP/files_sharing.po | 4 +-
l10n/ja_JP/files_trashbin.po | 4 +-
l10n/ja_JP/files_versions.po | 4 +-
l10n/ja_JP/lib.po | 4 +-
l10n/ja_JP/settings.po | 44 +--
l10n/ja_JP/user_ldap.po | 4 +-
l10n/ja_JP/user_webdavauth.po | 8 +-
l10n/ka/core.po | 22 +-
l10n/ka/files.po | 4 +-
l10n/ka/files_encryption.po | 75 +++-
l10n/ka/files_external.po | 4 +-
l10n/ka/files_sharing.po | 4 +-
l10n/ka/files_trashbin.po | 4 +-
l10n/ka/files_versions.po | 4 +-
l10n/ka/lib.po | 68 ++--
l10n/ka/settings.po | 52 +--
l10n/ka/user_ldap.po | 4 +-
l10n/ka/user_webdavauth.po | 4 +-
l10n/ka_GE/core.po | 4 +-
l10n/ka_GE/files.po | 4 +-
l10n/ka_GE/files_encryption.po | 85 ++++-
l10n/ka_GE/files_external.po | 4 +-
l10n/ka_GE/files_sharing.po | 4 +-
l10n/ka_GE/files_trashbin.po | 4 +-
l10n/ka_GE/files_versions.po | 4 +-
l10n/ka_GE/lib.po | 4 +-
l10n/ka_GE/settings.po | 44 +--
l10n/ka_GE/user_ldap.po | 4 +-
l10n/ka_GE/user_webdavauth.po | 6 +-
l10n/kn/core.po | 22 +-
l10n/kn/files.po | 4 +-
l10n/kn/files_encryption.po | 75 +++-
l10n/kn/files_external.po | 4 +-
l10n/kn/files_sharing.po | 4 +-
l10n/kn/files_trashbin.po | 4 +-
l10n/kn/files_versions.po | 4 +-
l10n/kn/lib.po | 68 ++--
l10n/kn/settings.po | 64 ++--
l10n/kn/user_ldap.po | 4 +-
l10n/kn/user_webdavauth.po | 4 +-
l10n/ko/core.po | 4 +-
l10n/ko/files.po | 4 +-
l10n/ko/files_encryption.po | 77 +++-
l10n/ko/files_external.po | 4 +-
l10n/ko/files_sharing.po | 4 +-
l10n/ko/files_trashbin.po | 4 +-
l10n/ko/files_versions.po | 4 +-
l10n/ko/lib.po | 4 +-
l10n/ko/settings.po | 42 ++-
l10n/ko/user_ldap.po | 4 +-
l10n/ko/user_webdavauth.po | 13 +-
l10n/ku_IQ/core.po | 4 +-
l10n/ku_IQ/files.po | 4 +-
l10n/ku_IQ/files_encryption.po | 77 +++-
l10n/ku_IQ/files_external.po | 4 +-
l10n/ku_IQ/files_sharing.po | 4 +-
l10n/ku_IQ/files_trashbin.po | 4 +-
l10n/ku_IQ/files_versions.po | 4 +-
l10n/ku_IQ/lib.po | 4 +-
l10n/ku_IQ/settings.po | 42 ++-
l10n/ku_IQ/user_ldap.po | 4 +-
l10n/ku_IQ/user_webdavauth.po | 4 +-
l10n/lb/core.po | 4 +-
l10n/lb/files.po | 4 +-
l10n/lb/files_encryption.po | 75 +++-
l10n/lb/files_external.po | 4 +-
l10n/lb/files_sharing.po | 4 +-
l10n/lb/files_trashbin.po | 4 +-
l10n/lb/files_versions.po | 4 +-
l10n/lb/lib.po | 4 +-
l10n/lb/settings.po | 42 ++-
l10n/lb/user_ldap.po | 4 +-
l10n/lb/user_webdavauth.po | 4 +-
l10n/lt_LT/core.po | 4 +-
l10n/lt_LT/files.po | 4 +-
l10n/lt_LT/files_encryption.po | 77 +++-
l10n/lt_LT/files_external.po | 4 +-
l10n/lt_LT/files_sharing.po | 4 +-
l10n/lt_LT/files_trashbin.po | 4 +-
l10n/lt_LT/files_versions.po | 4 +-
l10n/lt_LT/lib.po | 4 +-
l10n/lt_LT/settings.po | 42 ++-
l10n/lt_LT/user_ldap.po | 4 +-
l10n/lt_LT/user_webdavauth.po | 6 +-
l10n/lv/core.po | 4 +-
l10n/lv/files.po | 4 +-
l10n/lv/files_encryption.po | 83 ++++-
l10n/lv/files_external.po | 4 +-
l10n/lv/files_sharing.po | 4 +-
l10n/lv/files_trashbin.po | 4 +-
l10n/lv/files_versions.po | 4 +-
l10n/lv/lib.po | 4 +-
l10n/lv/settings.po | 42 ++-
l10n/lv/user_ldap.po | 4 +-
l10n/lv/user_webdavauth.po | 6 +-
l10n/mk/core.po | 4 +-
l10n/mk/files.po | 4 +-
l10n/mk/files_encryption.po | 77 +++-
l10n/mk/files_external.po | 4 +-
l10n/mk/files_sharing.po | 4 +-
l10n/mk/files_trashbin.po | 4 +-
l10n/mk/files_versions.po | 4 +-
l10n/mk/lib.po | 4 +-
l10n/mk/settings.po | 42 ++-
l10n/mk/user_ldap.po | 4 +-
l10n/mk/user_webdavauth.po | 6 +-
l10n/ms_MY/core.po | 4 +-
l10n/ms_MY/files.po | 4 +-
l10n/ms_MY/files_encryption.po | 75 +++-
l10n/ms_MY/files_external.po | 4 +-
l10n/ms_MY/files_sharing.po | 4 +-
l10n/ms_MY/files_trashbin.po | 4 +-
l10n/ms_MY/files_versions.po | 4 +-
l10n/ms_MY/lib.po | 4 +-
l10n/ms_MY/settings.po | 42 ++-
l10n/ms_MY/user_ldap.po | 4 +-
l10n/ms_MY/user_webdavauth.po | 4 +-
l10n/my_MM/core.po | 4 +-
l10n/my_MM/files.po | 4 +-
l10n/my_MM/files_encryption.po | 75 +++-
l10n/my_MM/files_external.po | 4 +-
l10n/my_MM/files_sharing.po | 4 +-
l10n/my_MM/files_trashbin.po | 4 +-
l10n/my_MM/files_versions.po | 4 +-
l10n/my_MM/lib.po | 4 +-
l10n/my_MM/settings.po | 52 +--
l10n/my_MM/user_ldap.po | 4 +-
l10n/my_MM/user_webdavauth.po | 4 +-
l10n/nb_NO/core.po | 4 +-
l10n/nb_NO/files.po | 4 +-
l10n/nb_NO/files_encryption.po | 83 ++++-
l10n/nb_NO/files_external.po | 4 +-
l10n/nb_NO/files_sharing.po | 4 +-
l10n/nb_NO/files_trashbin.po | 4 +-
l10n/nb_NO/files_versions.po | 4 +-
l10n/nb_NO/lib.po | 4 +-
l10n/nb_NO/settings.po | 44 +--
l10n/nb_NO/user_ldap.po | 4 +-
l10n/nb_NO/user_webdavauth.po | 6 +-
l10n/ne/core.po | 22 +-
l10n/ne/files.po | 4 +-
l10n/ne/files_encryption.po | 75 +++-
l10n/ne/files_external.po | 4 +-
l10n/ne/files_sharing.po | 4 +-
l10n/ne/files_trashbin.po | 4 +-
l10n/ne/files_versions.po | 4 +-
l10n/ne/lib.po | 68 ++--
l10n/ne/settings.po | 64 ++--
l10n/ne/user_ldap.po | 4 +-
l10n/ne/user_webdavauth.po | 4 +-
l10n/nl/core.po | 4 +-
l10n/nl/files.po | 4 +-
l10n/nl/files_encryption.po | 83 ++++-
l10n/nl/files_external.po | 4 +-
l10n/nl/files_sharing.po | 4 +-
l10n/nl/files_trashbin.po | 4 +-
l10n/nl/files_versions.po | 4 +-
l10n/nl/lib.po | 4 +-
l10n/nl/settings.po | 44 +--
l10n/nl/user_ldap.po | 4 +-
l10n/nl/user_webdavauth.po | 8 +-
l10n/nn_NO/core.po | 4 +-
l10n/nn_NO/files.po | 4 +-
l10n/nn_NO/files_encryption.po | 75 +++-
l10n/nn_NO/files_external.po | 4 +-
l10n/nn_NO/files_sharing.po | 4 +-
l10n/nn_NO/files_trashbin.po | 4 +-
l10n/nn_NO/files_versions.po | 4 +-
l10n/nn_NO/lib.po | 4 +-
l10n/nn_NO/settings.po | 44 +--
l10n/nn_NO/user_ldap.po | 4 +-
l10n/nn_NO/user_webdavauth.po | 4 +-
l10n/oc/core.po | 4 +-
l10n/oc/files.po | 4 +-
l10n/oc/files_encryption.po | 75 +++-
l10n/oc/files_external.po | 4 +-
l10n/oc/files_sharing.po | 4 +-
l10n/oc/files_trashbin.po | 4 +-
l10n/oc/files_versions.po | 4 +-
l10n/oc/lib.po | 4 +-
l10n/oc/settings.po | 42 ++-
l10n/oc/user_ldap.po | 4 +-
l10n/oc/user_webdavauth.po | 4 +-
l10n/pl/core.po | 6 +-
l10n/pl/files.po | 4 +-
l10n/pl/files_encryption.po | 83 ++++-
l10n/pl/files_external.po | 4 +-
l10n/pl/files_sharing.po | 4 +-
l10n/pl/files_trashbin.po | 4 +-
l10n/pl/files_versions.po | 4 +-
l10n/pl/lib.po | 9 +-
l10n/pl/settings.po | 44 +--
l10n/pl/user_ldap.po | 21 +-
l10n/pl/user_webdavauth.po | 10 +-
l10n/pl_PL/core.po | 4 +-
l10n/pl_PL/files.po | 4 +-
l10n/pl_PL/files_encryption.po | 75 +++-
l10n/pl_PL/files_external.po | 6 +-
l10n/pl_PL/files_sharing.po | 6 +-
l10n/pl_PL/files_trashbin.po | 6 +-
l10n/pl_PL/files_versions.po | 6 +-
l10n/pl_PL/lib.po | 4 +-
l10n/pl_PL/settings.po | 44 +--
l10n/pl_PL/user_ldap.po | 222 ++++++++----
l10n/pl_PL/user_webdavauth.po | 6 +-
l10n/pt_BR/core.po | 6 +-
l10n/pt_BR/files.po | 4 +-
l10n/pt_BR/files_encryption.po | 83 ++++-
l10n/pt_BR/files_external.po | 4 +-
l10n/pt_BR/files_sharing.po | 4 +-
l10n/pt_BR/files_trashbin.po | 4 +-
l10n/pt_BR/files_versions.po | 4 +-
l10n/pt_BR/lib.po | 4 +-
l10n/pt_BR/settings.po | 44 +--
l10n/pt_BR/user_ldap.po | 4 +-
l10n/pt_BR/user_webdavauth.po | 8 +-
l10n/pt_PT/core.po | 4 +-
l10n/pt_PT/files.po | 4 +-
l10n/pt_PT/files_encryption.po | 83 ++++-
l10n/pt_PT/files_external.po | 4 +-
l10n/pt_PT/files_sharing.po | 4 +-
l10n/pt_PT/files_trashbin.po | 4 +-
l10n/pt_PT/files_versions.po | 4 +-
l10n/pt_PT/lib.po | 4 +-
l10n/pt_PT/settings.po | 44 +--
l10n/pt_PT/user_ldap.po | 4 +-
l10n/pt_PT/user_webdavauth.po | 8 +-
l10n/ro/core.po | 4 +-
l10n/ro/files.po | 4 +-
l10n/ro/files_encryption.po | 77 +++-
l10n/ro/files_external.po | 4 +-
l10n/ro/files_sharing.po | 4 +-
l10n/ro/files_trashbin.po | 4 +-
l10n/ro/files_versions.po | 4 +-
l10n/ro/lib.po | 4 +-
l10n/ro/settings.po | 42 ++-
l10n/ro/user_ldap.po | 4 +-
l10n/ro/user_webdavauth.po | 8 +-
l10n/ru/core.po | 4 +-
l10n/ru/files.po | 4 +-
l10n/ru/files_encryption.po | 83 ++++-
l10n/ru/files_external.po | 4 +-
l10n/ru/files_sharing.po | 4 +-
l10n/ru/files_trashbin.po | 4 +-
l10n/ru/files_versions.po | 4 +-
l10n/ru/lib.po | 4 +-
l10n/ru/settings.po | 44 +--
l10n/ru/user_ldap.po | 4 +-
l10n/ru/user_webdavauth.po | 10 +-
l10n/ru_RU/core.po | 4 +-
l10n/ru_RU/files.po | 2 +-
l10n/ru_RU/files_encryption.po | 81 ++++-
l10n/ru_RU/files_external.po | 2 +-
l10n/ru_RU/files_sharing.po | 2 +-
l10n/ru_RU/files_trashbin.po | 2 +-
l10n/ru_RU/files_versions.po | 7 +-
l10n/ru_RU/lib.po | 4 +-
l10n/ru_RU/settings.po | 44 +--
l10n/ru_RU/user_ldap.po | 2 +-
l10n/ru_RU/user_webdavauth.po | 16 +-
l10n/si_LK/core.po | 4 +-
l10n/si_LK/files.po | 4 +-
l10n/si_LK/files_encryption.po | 77 +++-
l10n/si_LK/files_external.po | 4 +-
l10n/si_LK/files_sharing.po | 4 +-
l10n/si_LK/files_trashbin.po | 4 +-
l10n/si_LK/files_versions.po | 4 +-
l10n/si_LK/lib.po | 4 +-
l10n/si_LK/settings.po | 42 ++-
l10n/si_LK/user_ldap.po | 4 +-
l10n/si_LK/user_webdavauth.po | 6 +-
l10n/sk/core.po | 22 +-
l10n/sk/files.po | 4 +-
l10n/sk/files_encryption.po | 75 +++-
l10n/sk/files_external.po | 4 +-
l10n/sk/files_sharing.po | 4 +-
l10n/sk/files_trashbin.po | 4 +-
l10n/sk/files_versions.po | 4 +-
l10n/sk/lib.po | 68 ++--
l10n/sk/settings.po | 64 ++--
l10n/sk/user_ldap.po | 4 +-
l10n/sk/user_webdavauth.po | 4 +-
l10n/sk_SK/core.po | 4 +-
l10n/sk_SK/files.po | 4 +-
l10n/sk_SK/files_encryption.po | 83 ++++-
l10n/sk_SK/files_external.po | 4 +-
l10n/sk_SK/files_sharing.po | 4 +-
l10n/sk_SK/files_trashbin.po | 4 +-
l10n/sk_SK/files_versions.po | 4 +-
l10n/sk_SK/lib.po | 4 +-
l10n/sk_SK/settings.po | 44 +--
l10n/sk_SK/user_ldap.po | 4 +-
l10n/sk_SK/user_webdavauth.po | 8 +-
l10n/sl/core.po | 4 +-
l10n/sl/files.po | 4 +-
l10n/sl/files_encryption.po | 83 ++++-
l10n/sl/files_external.po | 4 +-
l10n/sl/files_sharing.po | 4 +-
l10n/sl/files_trashbin.po | 4 +-
l10n/sl/files_versions.po | 4 +-
l10n/sl/lib.po | 4 +-
l10n/sl/settings.po | 44 +--
l10n/sl/user_ldap.po | 4 +-
l10n/sl/user_webdavauth.po | 8 +-
l10n/sq/core.po | 4 +-
l10n/sq/files.po | 4 +-
l10n/sq/files_encryption.po | 75 +++-
l10n/sq/files_external.po | 4 +-
l10n/sq/files_sharing.po | 4 +-
l10n/sq/files_trashbin.po | 4 +-
l10n/sq/files_versions.po | 4 +-
l10n/sq/lib.po | 4 +-
l10n/sq/settings.po | 42 ++-
l10n/sq/user_ldap.po | 4 +-
l10n/sq/user_webdavauth.po | 4 +-
l10n/sr/core.po | 4 +-
l10n/sr/files.po | 4 +-
l10n/sr/files_encryption.po | 77 +++-
l10n/sr/files_external.po | 4 +-
l10n/sr/files_sharing.po | 4 +-
l10n/sr/files_trashbin.po | 4 +-
l10n/sr/files_versions.po | 4 +-
l10n/sr/lib.po | 4 +-
l10n/sr/settings.po | 42 ++-
l10n/sr/user_ldap.po | 4 +-
l10n/sr/user_webdavauth.po | 6 +-
l10n/sr@latin/core.po | 4 +-
l10n/sr@latin/files.po | 4 +-
l10n/sr@latin/files_encryption.po | 75 +++-
l10n/sr@latin/files_external.po | 4 +-
l10n/sr@latin/files_sharing.po | 4 +-
l10n/sr@latin/files_trashbin.po | 4 +-
l10n/sr@latin/files_versions.po | 4 +-
l10n/sr@latin/lib.po | 4 +-
l10n/sr@latin/settings.po | 42 ++-
l10n/sr@latin/user_ldap.po | 4 +-
l10n/sr@latin/user_webdavauth.po | 4 +-
l10n/sv/core.po | 4 +-
l10n/sv/files.po | 4 +-
l10n/sv/files_encryption.po | 83 ++++-
l10n/sv/files_external.po | 4 +-
l10n/sv/files_sharing.po | 4 +-
l10n/sv/files_trashbin.po | 4 +-
l10n/sv/files_versions.po | 4 +-
l10n/sv/lib.po | 4 +-
l10n/sv/settings.po | 42 ++-
l10n/sv/user_ldap.po | 4 +-
l10n/sv/user_webdavauth.po | 6 +-
l10n/sw_KE/core.po | 22 +-
l10n/sw_KE/files.po | 4 +-
l10n/sw_KE/files_encryption.po | 75 +++-
l10n/sw_KE/files_external.po | 4 +-
l10n/sw_KE/files_sharing.po | 4 +-
l10n/sw_KE/files_trashbin.po | 4 +-
l10n/sw_KE/files_versions.po | 4 +-
l10n/sw_KE/lib.po | 68 ++--
l10n/sw_KE/settings.po | 64 ++--
l10n/sw_KE/user_ldap.po | 4 +-
l10n/sw_KE/user_webdavauth.po | 4 +-
l10n/ta_LK/core.po | 4 +-
l10n/ta_LK/files.po | 4 +-
l10n/ta_LK/files_encryption.po | 77 +++-
l10n/ta_LK/files_external.po | 4 +-
l10n/ta_LK/files_sharing.po | 4 +-
l10n/ta_LK/files_trashbin.po | 4 +-
l10n/ta_LK/files_versions.po | 4 +-
l10n/ta_LK/lib.po | 4 +-
l10n/ta_LK/settings.po | 42 ++-
l10n/ta_LK/user_ldap.po | 4 +-
l10n/ta_LK/user_webdavauth.po | 6 +-
l10n/te/core.po | 4 +-
l10n/te/files.po | 4 +-
l10n/te/files_encryption.po | 75 +++-
l10n/te/files_external.po | 4 +-
l10n/te/files_sharing.po | 4 +-
l10n/te/files_trashbin.po | 4 +-
l10n/te/files_versions.po | 4 +-
l10n/te/lib.po | 4 +-
l10n/te/settings.po | 42 ++-
l10n/te/user_ldap.po | 4 +-
l10n/te/user_webdavauth.po | 4 +-
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 73 +++-
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 | 40 ++-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/core.po | 4 +-
l10n/th_TH/files.po | 4 +-
l10n/th_TH/files_encryption.po | 77 +++-
l10n/th_TH/files_external.po | 4 +-
l10n/th_TH/files_sharing.po | 4 +-
l10n/th_TH/files_trashbin.po | 4 +-
l10n/th_TH/files_versions.po | 4 +-
l10n/th_TH/lib.po | 4 +-
l10n/th_TH/settings.po | 42 ++-
l10n/th_TH/user_ldap.po | 4 +-
l10n/th_TH/user_webdavauth.po | 6 +-
l10n/tr/core.po | 4 +-
l10n/tr/files.po | 4 +-
l10n/tr/files_encryption.po | 83 ++++-
l10n/tr/files_external.po | 4 +-
l10n/tr/files_sharing.po | 4 +-
l10n/tr/files_trashbin.po | 4 +-
l10n/tr/files_versions.po | 4 +-
l10n/tr/lib.po | 4 +-
l10n/tr/settings.po | 44 +--
l10n/tr/user_ldap.po | 4 +-
l10n/tr/user_webdavauth.po | 4 +-
l10n/ug/core.po | 4 +-
l10n/ug/files.po | 4 +-
l10n/ug/files_encryption.po | 85 ++++-
l10n/ug/files_external.po | 4 +-
l10n/ug/files_sharing.po | 4 +-
l10n/ug/files_trashbin.po | 4 +-
l10n/ug/files_versions.po | 4 +-
l10n/ug/lib.po | 4 +-
l10n/ug/settings.po | 44 +--
l10n/ug/user_ldap.po | 4 +-
l10n/ug/user_webdavauth.po | 4 +-
l10n/uk/core.po | 4 +-
l10n/uk/files.po | 4 +-
l10n/uk/files_encryption.po | 83 ++++-
l10n/uk/files_external.po | 4 +-
l10n/uk/files_sharing.po | 4 +-
l10n/uk/files_trashbin.po | 4 +-
l10n/uk/files_versions.po | 4 +-
l10n/uk/lib.po | 4 +-
l10n/uk/settings.po | 42 ++-
l10n/uk/user_ldap.po | 4 +-
l10n/uk/user_webdavauth.po | 10 +-
l10n/ur_PK/core.po | 4 +-
l10n/ur_PK/files.po | 4 +-
l10n/ur_PK/files_encryption.po | 75 +++-
l10n/ur_PK/files_external.po | 4 +-
l10n/ur_PK/files_sharing.po | 4 +-
l10n/ur_PK/files_trashbin.po | 4 +-
l10n/ur_PK/files_versions.po | 4 +-
l10n/ur_PK/lib.po | 4 +-
l10n/ur_PK/settings.po | 42 ++-
l10n/ur_PK/user_ldap.po | 4 +-
l10n/ur_PK/user_webdavauth.po | 4 +-
l10n/vi/core.po | 4 +-
l10n/vi/files.po | 4 +-
l10n/vi/files_encryption.po | 83 ++++-
l10n/vi/files_external.po | 4 +-
l10n/vi/files_sharing.po | 4 +-
l10n/vi/files_trashbin.po | 4 +-
l10n/vi/files_versions.po | 4 +-
l10n/vi/lib.po | 4 +-
l10n/vi/settings.po | 42 ++-
l10n/vi/user_ldap.po | 4 +-
l10n/vi/user_webdavauth.po | 8 +-
l10n/zh_CN.GB2312/core.po | 4 +-
l10n/zh_CN.GB2312/files.po | 4 +-
l10n/zh_CN.GB2312/files_encryption.po | 77 +++-
l10n/zh_CN.GB2312/files_external.po | 4 +-
l10n/zh_CN.GB2312/files_sharing.po | 4 +-
l10n/zh_CN.GB2312/files_trashbin.po | 4 +-
l10n/zh_CN.GB2312/files_versions.po | 4 +-
l10n/zh_CN.GB2312/lib.po | 4 +-
l10n/zh_CN.GB2312/settings.po | 42 ++-
l10n/zh_CN.GB2312/user_ldap.po | 4 +-
l10n/zh_CN.GB2312/user_webdavauth.po | 4 +-
l10n/zh_CN/core.po | 4 +-
l10n/zh_CN/files.po | 4 +-
l10n/zh_CN/files_encryption.po | 83 ++++-
l10n/zh_CN/files_external.po | 4 +-
l10n/zh_CN/files_sharing.po | 4 +-
l10n/zh_CN/files_trashbin.po | 4 +-
l10n/zh_CN/files_versions.po | 4 +-
l10n/zh_CN/lib.po | 4 +-
l10n/zh_CN/settings.po | 44 +--
l10n/zh_CN/user_ldap.po | 4 +-
l10n/zh_CN/user_webdavauth.po | 12 +-
l10n/zh_HK/core.po | 4 +-
l10n/zh_HK/files.po | 4 +-
l10n/zh_HK/files_encryption.po | 81 ++++-
l10n/zh_HK/files_external.po | 4 +-
l10n/zh_HK/files_sharing.po | 4 +-
l10n/zh_HK/files_trashbin.po | 4 +-
l10n/zh_HK/files_versions.po | 4 +-
l10n/zh_HK/lib.po | 4 +-
l10n/zh_HK/settings.po | 42 ++-
l10n/zh_HK/user_ldap.po | 4 +-
l10n/zh_HK/user_webdavauth.po | 4 +-
l10n/zh_TW/core.po | 4 +-
l10n/zh_TW/files.po | 4 +-
l10n/zh_TW/files_encryption.po | 83 ++++-
l10n/zh_TW/files_external.po | 4 +-
l10n/zh_TW/files_sharing.po | 4 +-
l10n/zh_TW/files_trashbin.po | 4 +-
l10n/zh_TW/files_versions.po | 4 +-
l10n/zh_TW/lib.po | 4 +-
l10n/zh_TW/settings.po | 44 +--
l10n/zh_TW/user_ldap.po | 4 +-
l10n/zh_TW/user_webdavauth.po | 4 +-
lib/l10n/es.php | 1 +
lib/l10n/et_EE.php | 1 +
lib/l10n/gl.php | 1 +
lib/l10n/pl.php | 1 +
931 files changed, 10526 insertions(+), 4912 deletions(-)
create mode 100644 l10n/fi/files_trashbin.po
create mode 100644 l10n/fi/user_webdavauth.po
create mode 100644 l10n/hy/user_webdavauth.po
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index f34c9f59cf..c1c94b9900 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -57,7 +57,7 @@
"0 is unlimited" => "0 és sense lÃmit",
"Maximum input size for ZIP files" => "Mida mà xima d'entrada per fitxers ZIP",
"Save" => "Desa",
-"New" => "Nova",
+"New" => "Nou",
"Text file" => "Fitxer de text",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index c8a475afd6..43a81d1ef8 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "التشÙير",
-"File encryption is enabled." => "تشÙير الملÙات Ùعال.",
-"The following file types will not be encrypted:" => "الملÙات الاتية لن يتم تشÙيرها:",
-"Exclude the following file types from encryption:" => "إستثناء أنواع الملÙات الاتية من التشÙير: ",
-"None" => "لا شيء"
+"Encryption" => "التشÙير"
);
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 07a97f5f8a..7087a04269 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Криптиране",
-"None" => "ÐÑма"
+"Encryption" => "Криптиране"
);
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 43767d5651..b8241b5bbd 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "সংকেতায়ন",
-"None" => "কোনটিই নয়"
+"Encryption" => "সংকেতায়ন"
);
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 2d59a306d3..57a5897a3d 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Xifrat",
-"File encryption is enabled." => "El xifrat de fitxers està activat.",
-"The following file types will not be encrypted:" => "Els tipus de fitxers següents no es xifraran:",
-"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents del xifratge:",
-"None" => "Cap"
+"Encryption" => "Xifrat"
);
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index d225688a07..27ab9d0464 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Å ifrovánÃ",
-"File encryption is enabled." => "Šifrovánà je povoleno.",
-"The following file types will not be encrypted:" => "NásledujÃcà typy souborů nebudou Å¡ifrovány:",
-"Exclude the following file types from encryption:" => "Vyjmout následujÃcà typy souborů ze Å¡ifrovánÃ:",
-"None" => "Žádné"
+"Encryption" => "Å ifrovánÃ"
);
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
index 523b5dd73d..98571bf943 100644
--- a/apps/files_encryption/l10n/cy_GB.php
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Amgryptiad",
-"File encryption is enabled." => "Galluogwyd amgryptio ffeiliau.",
-"The following file types will not be encrypted:" => "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:",
-"Exclude the following file types from encryption:" => "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:",
-"None" => "Dim"
+"Encryption" => "Amgryptiad"
);
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index b085381ea7..b008f7884f 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Fil kryptering aktiveret.",
-"The following file types will not be encrypted:" => "De følgende filtyper vil ikke blive krypteret:",
-"Exclude the following file types from encryption:" => "Ekskluder de følgende fil typer fra kryptering:",
-"None" => "Ingen"
+"Encryption" => "Kryptering"
);
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index cdcd8a40b2..e62f244539 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Verschlüsselung",
-"File encryption is enabled." => "Dateiverschlüsselung ist aktiviert",
-"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
-"Exclude the following file types from encryption:" => "Schließe die folgenden Dateitypen von der Verschlüsselung aus:",
-"None" => "Keine"
+"Encryption" => "Verschlüsselung"
);
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 4f08b98eb2..e62f244539 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Verschlüsselung",
-"File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
-"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"
+"Encryption" => "Verschlüsselung"
);
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 0031a73194..aa439d40f0 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ΚÏυπτογÏάφηση",
-"File encryption is enabled." => "Η κÏυπτογÏάφηση αÏχείων είναι ενεÏγή.",
-"The following file types will not be encrypted:" => "Οι παÏακάτω Ï„Ïποι αÏχείων δεν θα κÏυπτογÏαφηθοÏν:",
-"Exclude the following file types from encryption:" => "ΕξαίÏεση των παÏακάτω Ï„Ïπων αÏχείων από την κÏυπτογÏάφηση:",
-"None" => "Καμία"
+"Encryption" => "ΚÏυπτογÏάφηση"
);
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 50847062c3..41880005c5 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Ĉifrado",
-"None" => "Nenio"
+"Encryption" => "Ĉifrado"
);
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 4ea87b92e7..26ace24e33 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Cifrado",
-"File encryption is enabled." => "La encriptacion de archivo esta activada.",
-"The following file types will not be encrypted:" => "Los siguientes tipos de archivo no seran encriptados:",
-"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivo de la encriptacion:",
-"None" => "Ninguno"
+"Encryption" => "Cifrado"
);
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index af522879e1..2a6360beb6 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Encriptación",
-"File encryption is enabled." => "La encriptación de archivos no está habilitada",
-"The following file types will not be encrypted:" => "Los siguientes tipos de archivos no serán encriptados",
-"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivos de encriptación:",
-"None" => "Ninguno"
+"Encryption" => "Encriptación"
);
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0d189ac062..07540ed8c3 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Krüpteerimine",
-"File encryption is enabled." => "Faili krüpteerimine on sisse lülitatud.",
-"The following file types will not be encrypted:" => "Järgnevaid failitüüpe ei krüpteerita:",
-"Exclude the following file types from encryption:" => "Järgnevaid failitüüpe ei krüpteerita:",
-"None" => "Pole"
+"Encryption" => "Krüpteerimine"
);
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 5a22b65728..f443a61d8a 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Enkriptazioa",
-"File encryption is enabled." => "Fitxategien enkriptazioa gaituta dago.",
-"The following file types will not be encrypted:" => "Hurrengo fitxategi motak ez dira enkriptatuko:",
-"Exclude the following file types from encryption:" => "Baztertu hurrengo fitxategi motak enkriptatzetik:",
-"None" => "Bat ere ez"
+"Encryption" => "Enkriptazioa"
);
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 7acf196b79..615e4b920e 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "رمزگذاری",
-"File encryption is enabled." => "رمزنگاری Ùایلها Ùعال شد.",
-"The following file types will not be encrypted:" => "Ùایلهای زیر رمزنگاری نخواهند شد:",
-"Exclude the following file types from encryption:" => "Ùایلهای زیر از رمزنگاری نادیده گرÙته Ù…ÛŒ شوند:",
-"None" => "هیچ‌کدام"
+"Encryption" => "رمزگذاری"
);
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 6352d396b3..bc67b9d858 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Salaus",
-"File encryption is enabled." => "Tiedostojen salaus on käytössä.",
-"The following file types will not be encrypted:" => "Seuraavia tiedostotyyppejä ei salata:",
-"Exclude the following file types from encryption:" => "Älä salaa seuravia tiedostotyyppejä:",
-"None" => "Ei mitään"
+"Encryption" => "Salaus"
);
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 88f1e4a393..20952995c4 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Chiffrement",
-"File encryption is enabled." => "Le chiffrement des fichiers est activé",
-"The following file types will not be encrypted:" => "Les fichiers de types suivants ne seront pas chiffrés :",
-"Exclude the following file types from encryption:" => "Ne pas chiffrer les fichiers dont les types sont les suivants :",
-"None" => "Aucun"
+"Encryption" => "Chiffrement"
);
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 3210f71545..26ace24e33 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Cifrado",
-"File encryption is enabled." => "O cifrado de ficheiros está activado",
-"The following file types will not be encrypted:" => "Os seguintes tipos de ficheiros non van seren cifrados:",
-"Exclude the following file types from encryption:" => "ExcluÃr os seguintes tipos de ficheiros do cifrado:",
-"None" => "Ningún"
+"Encryption" => "Cifrado"
);
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index cbb74bfee9..54d56c5fc0 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "×”×¦×¤× ×”",
-"None" => "כלו×"
+"Encryption" => "×”×¦×¤× ×”"
);
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 4043da108c..a80613ec0f 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "TitkosÃtás",
-"File encryption is enabled." => "Az állományok titkosÃtása be van kapcsolva.",
-"The following file types will not be encrypted:" => "A következÅ‘ fájltÃpusok nem kerülnek titkosÃtásra:",
-"Exclude the following file types from encryption:" => "Zárjuk ki a titkosÃtásból a következÅ‘ fájltÃpusokat:",
-"None" => "Egyik sem"
+"Encryption" => "TitkosÃtás"
);
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 6044348e72..e8778d4b4a 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"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"
+"Encryption" => "Enkripsi"
);
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index bd964185c4..6ca1b6ef7b 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Dulkóðun",
-"None" => "Ekkert"
+"Encryption" => "Dulkóðun"
);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 9ab9bc492a..129e5c1da1 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Cifratura",
-"File encryption is enabled." => "La cifratura dei file è abilitata.",
-"The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
-"Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
-"None" => "Nessuna"
+"Encryption" => "Cifratura"
);
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 35fba615ae..767c9642f6 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "æš—å·åŒ–",
-"File encryption is enabled." => "ファイルã®æš—å·åŒ–ã¯æœ‰åŠ¹ã§ã™ã€‚",
-"The following file types will not be encrypted:" => "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—ã¯æš—å·åŒ–ã•ã‚Œã¾ã›ã‚“:",
-"Exclude the following file types from encryption:" => "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—ã‚’æš—å·åŒ–ã‹ã‚‰é™¤å¤–:",
-"None" => "ãªã—"
+"Encryption" => "æš—å·åŒ–"
);
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index 0362c676f0..36b07bd386 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ენკრიპციáƒ",
-"File encryption is enabled." => "ფáƒáƒ˜áƒšáƒ˜áƒ¡ ენკრიპცირჩáƒáƒ თულიáƒ.",
-"The following file types will not be encrypted:" => "შემდეგი ფáƒáƒ˜áƒšáƒ£áƒ ი ტიპების ენკრიპცირáƒáƒ მáƒáƒ®áƒ“ებáƒ:",
-"Exclude the following file types from encryption:" => "áƒáƒ›áƒáƒ˜áƒ¦áƒ” შემდეგი ფáƒáƒ˜áƒšáƒ˜áƒ¡ ტიპები ენკრიპციიდáƒáƒœ:",
-"None" => "áƒáƒ áƒ"
+"Encryption" => "ენკრიპციáƒ"
);
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index bd1580578c..5935811bf2 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "암호화",
-"None" => "ì—†ìŒ"
+"Encryption" => "암호화"
);
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 02c030014f..ff6c34b71d 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "نهێنیکردن",
-"None" => "هیچ"
+"Encryption" => "نهێنیکردن"
);
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 67769c8f36..7ec3a32e02 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Å ifravimas",
-"None" => "Nieko"
+"Encryption" => "Å ifravimas"
);
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index fc31ccdb92..abcc0305c1 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Šifrēšana",
-"File encryption is enabled." => "Datņu šifrēšana ir aktivēta.",
-"The following file types will not be encrypted:" => "SekojoÅ¡Äs datnes netiks Å¡ifrÄ“tas:",
-"Exclude the following file types from encryption:" => "Sekojošos datņu tipus izslēgt no šifrēšanas:",
-"None" => "Nav"
+"Encryption" => "Šifrēšana"
);
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index 513606fadc..a355a8433a 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Енкрипција",
-"None" => "Ðишто"
+"Encryption" => "Енкрипција"
);
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index a5e16a0342..b008f7884f 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Fil-kryptering er aktivert.",
-"The following file types will not be encrypted:" => "Følgende filtyper vil ikke bli kryptert:",
-"Exclude the following file types from encryption:" => "Ekskluder følgende filtyper fra kryptering:",
-"None" => "Ingen"
+"Encryption" => "Kryptering"
);
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index b1cba96aad..11cdc1e7a6 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Versleuteling",
-"File encryption is enabled." => "Bestandsversleuteling geactiveerd.",
-"The following file types will not be encrypted:" => "De volgende bestandstypen zullen niet worden versleuteld:",
-"Exclude the following file types from encryption:" => "Sluit de volgende bestandstypen uit van versleuteling:",
-"None" => "Geen"
+"Encryption" => "Versleuteling"
);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 2fa86f454f..02f827f8d5 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Szyfrowanie",
-"File encryption is enabled." => "Szyfrowanie plików jest włączone",
-"The following file types will not be encrypted:" => "Poniższe typy plików nie będą szyfrowane:",
-"Exclude the following file types from encryption:" => "Wyłącz poniższe typy plików z szyfrowania:",
-"None" => "Brak"
+"Encryption" => "Szyfrowanie"
);
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 28807db72c..4da459593a 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Criptografia",
-"File encryption is enabled." => "A criptografia de arquivos está ativada.",
-"The following file types will not be encrypted:" => "Os seguintes tipos de arquivo não serão criptografados:",
-"Exclude the following file types from encryption:" => "Excluir os seguintes tipos de arquivo da criptografia:",
-"None" => "Nenhuma"
+"Encryption" => "Criptografia"
);
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 1c46011fc1..eda3e275b2 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Encriptação",
-"File encryption is enabled." => "A encriptação de ficheiros está ligada",
-"The following file types will not be encrypted:" => "Os seguintes ficheiros não serão encriptados:",
-"Exclude the following file types from encryption:" => "Excluir da encriptação os seguintes tipos de ficheiro:",
-"None" => "Nenhum"
+"Encryption" => "Encriptação"
);
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index a5a6fb3cb7..d24f3cf5dc 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ÃŽncriptare",
-"None" => "Niciuna"
+"Encryption" => "ÃŽncriptare"
);
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 22c1e3da37..870557d835 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Шифрование",
-"File encryption is enabled." => "Шифрование файла включено.",
-"The following file types will not be encrypted:" => "Следующие типы файлов не будут зашифрованы:",
-"Exclude the following file types from encryption:" => "ИÑключить Ñледующие типы файлов из шифрованных:",
-"None" => "Ðичего"
+"Encryption" => "Шифрование"
);
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index d9cec4b722..c55d5609a8 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ගුප්චකේà¶à¶±à¶º",
-"None" => "කිසිවක් නà·à¶"
+"Encryption" => "ගුප්චකේà¶à¶±à¶º"
);
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index bebb623471..bf15777fc1 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Å ifrovanie",
-"File encryption is enabled." => "Šifrovanie súborov nastavené.",
-"The following file types will not be encrypted:" => "Uvedené typy súborov nebudú šifrované:",
-"Exclude the following file types from encryption:" => "Nešifrovať uvedené typy súborov",
-"None" => "Žiadne"
+"Encryption" => "Å ifrovanie"
);
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 4754e21214..272c6e1bb3 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Å ifriranje",
-"File encryption is enabled." => "Å ifriranje datotek je omogoÄeno.",
-"The following file types will not be encrypted:" => "Navedene vrste datotek ne bodo Å¡ifrirane:",
-"Exclude the following file types from encryption:" => "Ne Å¡ifriraj navedenih vrst datotek:",
-"None" => "Brez"
+"Encryption" => "Å ifriranje"
);
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index 91f7fc62a9..2e3698918f 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Шифровање",
-"None" => "Ðишта"
+"Encryption" => "Шифровање"
);
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index e214a937a1..b008f7884f 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Filkryptering är aktiverat.",
-"The following file types will not be encrypted:" => "Följande filtyper kommer inte att krypteras:",
-"Exclude the following file types from encryption:" => "Exkludera följande filtyper från kryptering:",
-"None" => "Ingen"
+"Encryption" => "Kryptering"
);
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 152e631d0f..adc5a69a1b 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯",
-"None" => "ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
+"Encryption" => "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯"
);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index e46d249118..881e1d834b 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "à¸à¸²à¸£à¹€à¸‚้ารหัส",
-"None" => "ไม่ต้à¸à¸‡"
+"Encryption" => "à¸à¸²à¸£à¹€à¸‚้ารหัส"
);
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 6b42c757e6..e7481153b1 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Åž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"
+"Encryption" => "Åžifreleme"
);
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index 34eeb373b3..278fdc2ce8 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "شىÙىرلاش",
-"File encryption is enabled." => "ھۆججەت شىÙىرلاش قوزغىتىلدى.",
-"The following file types will not be encrypted:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىÙىرلانمايدۇ:",
-"Exclude the following file types from encryption:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىÙÙ‰Ø±Ù„Ø§Ø´Ù†Ù‰Ú Ø³Ù‰Ø±ØªÙ‰Ø¯Ø§:",
-"None" => "يوق"
+"Encryption" => "شىÙىرلاش"
);
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index d495714119..cdbbd8801a 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "ШифруваннÑ",
-"File encryption is enabled." => "Увімкнуто ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð².",
-"The following file types will not be encrypted:" => "Такі типи файлів шифруватиÑÑŒ не будуть:",
-"Exclude the following file types from encryption:" => "Виключити наÑтупні типи файлів з ​​шифруваннÑ:",
-"None" => "Жоден"
+"Encryption" => "ШифруваннÑ"
);
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 0a88d1b2db..34ab60796d 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "Mã hóa",
-"File encryption is enabled." => "Mã hóa file đã mở",
-"The following file types will not be encrypted:" => "Loại file sau sẽ không được mã hóa",
-"Exclude the following file types from encryption:" => "Việc mã hóa không bao gồm loại file sau",
-"None" => "Không có gì hết"
+"Encryption" => "Mã hóa"
);
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 12d903e656..0a38a2ddf8 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "åŠ å¯†",
-"None" => "æ— "
+"Encryption" => "åŠ å¯†"
);
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 13fa95203e..0a38a2ddf8 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "åŠ å¯†",
-"File encryption is enabled." => "æ–‡ä»¶åŠ å¯†å·²å¯ç”¨.",
-"The following file types will not be encrypted:" => "如下的文件类型将ä¸ä¼šè¢«åŠ 密:",
-"Exclude the following file types from encryption:" => "ä»ŽåŠ å¯†ä¸æŽ’除如下的文件类型:",
-"None" => "æ— "
+"Encryption" => "åŠ å¯†"
);
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index 0c0b709fdc..0a38a2ddf8 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,6 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "åŠ å¯†",
-"File encryption is enabled." => "æª”æ¡ˆåŠ å¯†å·²é–‹å•Ÿ",
-"The following file types will not be encrypted:" => "以下文件類別將ä¸æœƒè¢«åŠ 密",
-"None" => "空"
+"Encryption" => "åŠ å¯†"
);
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 95e61b45dc..0a38a2ddf8 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,7 +1,3 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "åŠ å¯†",
-"File encryption is enabled." => "æª”æ¡ˆåŠ å¯†å·²è¢«å•Ÿç”¨",
-"The following file types will not be encrypted:" => "以下的文件類型ä¸æœƒè¢«åŠ 密：",
-"Exclude the following file types from encryption:" => "å¾žåŠ å¯†ä¸æŽ’除的檔案類型：",
-"None" => "ç„¡"
+"Encryption" => "åŠ å¯†"
);
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 31c5dcb4ef..288518e1a4 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -13,5 +13,6 @@
"{count} files" => "{count} файла",
"Nothing in here. Your trash bin is empty!" => "ÐÑма нищо. Кофата е празна!",
"Restore" => "ВъзтановÑване",
-"Delete" => "Изтриване"
+"Delete" => "Изтриване",
+"Deleted Files" => "Изтрити файлове"
);
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index e06c66784f..62a63d515a 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -2,13 +2,13 @@
"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
"Couldn't restore %s" => "Tidak dapat memulihkan %s",
"perform restore operation" => "jalankan operasi pemulihan",
-"Error" => "kesalahan",
+"Error" => "Galat",
"delete file permanently" => "hapus berkas secara permanen",
-"Delete permanently" => "hapus secara permanen",
+"Delete permanently" => "Hapus secara permanen",
"Name" => "Nama",
"Deleted" => "Dihapus",
-"1 folder" => "1 map",
-"{count} folders" => "{count} map",
+"1 folder" => "1 folder",
+"{count} folders" => "{count} folder",
"1 file" => "1 berkas",
"{count} files" => "{count} berkas",
"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 7fd1ab21ec..5c9f558f11 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -8,9 +8,9 @@
"Name" => "Nazwa",
"Deleted" => "Usunięte",
"1 folder" => "1 folder",
-"{count} folders" => "{count} foldery",
+"{count} folders" => "Ilość folderów: {count}",
"1 file" => "1 plik",
-"{count} files" => "{count} pliki",
+"{count} files" => "Ilość plików: {count}",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Restore" => "Przywróć",
"Delete" => "Usuń",
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 7dfe610466..ba85158b70 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -13,6 +13,6 @@
"{count} files" => "{count} ficheiros",
"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
"Restore" => "Restaurar",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
"Deleted Files" => "Ficheiros Apagados"
);
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index c03ef600f3..3af21b7e3f 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Error" => "Eroare",
+"Delete permanently" => "Stergere permanenta",
"Name" => "Nume",
"1 folder" => "1 folder",
"{count} folders" => "{count} foldare",
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 7203f4c75f..7cef36ef1c 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -5,7 +5,7 @@
"Error" => "Chyba",
"delete file permanently" => "trvalo zmazať súbor",
"Delete permanently" => "Zmazať trvalo",
-"Name" => "Meno",
+"Name" => "Názov",
"Deleted" => "Zmazané",
"1 folder" => "1 prieÄinok",
"{count} folders" => "{count} prieÄinkov",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 7c72cc8e63..31d43288e5 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,19 +1,21 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ocurrió un fallo al borrar las asignaciones.",
"Failed to delete the server configuration" => "No se pudo borrar la configuración del servidor",
"The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión puede establecerse!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "La configuración no es válida. Por favor, busque en el log de ownCloud para más detalles.",
"Deletion failed" => "Falló el borrado",
-"Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
+"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
"Keep settings?" => "Mantener la configuración?",
"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
"Success" => "Éxito",
"Error" => "Error",
"Connection test succeeded" => "La prueba de conexión fue exitosa",
"Connection test failed" => "La prueba de conexión falló",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
"Confirm Deletion" => "Confirmar eliminación",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
"Server configuration" => "Configuración del Servidor",
"Add Server Configuration" => "Agregar configuracion del servidor",
@@ -28,30 +30,30 @@
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacÃos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como placeholder, ej: \"uid=%%uid\"",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como comodÃn, ej: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin placeholder, ej: \"objectClass=person\".",
+"without any placeholder, e.g. \"objectClass=person\"." => "Sin comodines, ej: \"objectClass=person\".",
"Group Filter" => "Filtro de grupo",
"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Con cualquier placeholder, ej: \"objectClass=posixGroup\".",
-"Connection Settings" => "Configuracion de coneccion",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sin comodines, ej: \"objectClass=posixGroup\".",
+"Connection Settings" => "Configuración de conexión",
"Configuration Active" => "Configuracion activa",
"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
"Port" => "Puerto",
-"Backup (Replica) Host" => "Host para backup (Replica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
-"Backup (Replica) Port" => "Puerto para backup (Replica)",
+"Backup (Replica) Host" => "Servidor de copia de seguridad (Replica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
"Disable Main Server" => "Deshabilitar servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica",
+"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente conectará al servidor replica",
"Use TLS" => "Usar TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conecciones LDAPS, estas fallaran",
-"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
+"Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
+"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
"Cache Time-To-Live" => "Cache TTL",
-"in seconds. A change empties the cache." => "en segundos. Un cambio vacÃa la cache.",
+"in seconds. A change empties the cache." => "en segundos. Un cambio vacÃa la caché.",
"Directory Settings" => "Configuracion de directorio",
"User Display Name Field" => "Campo de nombre de usuario a mostrar",
"The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
@@ -73,7 +75,15 @@
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "VacÃo para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
"Internal Username" => "Nombre de usuario interno",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto el nombre de usuario interno será creado desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente quitados. En coincidencias un número será añadido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es también el nombre por defecto para la carpeta personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. Déjalo vacÃo para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
+"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los nuevos usuarios y grupos de LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda"
);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index a7a831e3e5..29c814b5fb 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nie udało się wyczyścić mapowania.",
"Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
@@ -7,6 +8,7 @@
"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
"Keep settings?" => "Zachować ustawienia?",
"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
+"mappings cleared" => "Mapoanie wyczyszczone",
"Success" => "Sukces",
"Error" => "BÅ‚Ä…d",
"Connection test succeeded" => "Test połączenia udany",
@@ -72,6 +74,11 @@
"Email Field" => "Pole email",
"User Home Folder Naming Rule" => "Reguły nazewnictwa folderu domowego użytkownika",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
+"Internal Username" => "Wewnętrzna nazwa użytkownika",
+"Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
+"Override UUID detection" => "ZastÄ…p wykrywanie UUID",
+"UUID Attribute:" => "Atrybuty UUID:",
+"Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
"Test Configuration" => "Konfiguracja testowa",
"Help" => "Pomoc"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 6a5a6ea542..323ef7997f 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -46,6 +46,7 @@
"years ago" => "anys enrere",
"Choose" => "Escull",
"Cancel" => "Cancel·la",
+"Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
"Yes" => "SÃ",
"No" => "No",
"Ok" => "D'acord",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2d9adb15cc..4b8d5c7b18 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -46,6 +46,7 @@
"years ago" => "hace años",
"Choose" => "Seleccionar",
"Cancel" => "Cancelar",
+"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
"Yes" => "SÃ",
"No" => "No",
"Ok" => "Aceptar",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index d298b74fc0..fd05062408 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -46,6 +46,7 @@
"years ago" => "aastat tagasi",
"Choose" => "Vali",
"Cancel" => "Loobu",
+"Error loading file picker template" => "Viga failivalija malli laadimisel",
"Yes" => "Jah",
"No" => "Ei",
"Ok" => "Ok",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 3e05f7ec3f..9865269544 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -46,6 +46,7 @@
"years ago" => "anos atrás",
"Choose" => "Escoller",
"Cancel" => "Cancelar",
+"Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
"Yes" => "Si",
"No" => "Non",
"Ok" => "Aceptar",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5f25445080..8395a1d272 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -46,6 +46,7 @@
"years ago" => "å¹´å‰",
"Choose" => "é¸æŠž",
"Cancel" => "ã‚ャンセル",
+"Error loading file picker template" => "ファイルピッカーã®ãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼",
"Yes" => "ã¯ã„",
"No" => "ã„ã„ãˆ",
"Ok" => "OK",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 335dda6f4d..045da821f2 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -46,6 +46,7 @@
"years ago" => "lat temu",
"Choose" => "Wybierz",
"Cancel" => "Anuluj",
+"Error loading file picker template" => "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu",
"Yes" => "Tak",
"No" => "Nie",
"Ok" => "OK",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 9ce255980c..59c8f69aee 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -46,6 +46,7 @@
"years ago" => "anos atrás",
"Choose" => "Escolha",
"Cancel" => "Cancelar",
+"Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
"Yes" => "Sim",
"No" => "Não",
"Ok" => "Ok",
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 7474a030a0..a624008674 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index a1b17ff718..159278587d 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 36aa676dfb..8d8d6032e0 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 661213122b..30a7d76922 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 268f465228..934d01cdeb 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index b98068957e..59b6ea0942 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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index d21eec3f1e..a663f48e17 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 007aa81cc8..f7cb1209ce 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 641b7e82fc..868778c6d7 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Wagwoord"
@@ -423,7 +423,7 @@ msgstr "Nuwe wagwoord"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 9c44d57d8f..71d8cea474 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/user_webdavauth.po b/l10n/af_ZA/user_webdavauth.po
index bb29159478..62bfbe01b3 100644
--- a/l10n/af_ZA/user_webdavauth.po
+++ b/l10n/af_ZA/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index c1ec6581da..d06b5bff99 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index dd86ceb4bc..d45bfe2245 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index cde78c5cd1..7c86c6d247 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "التشÙير"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "تشÙير الملÙات Ùعال."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "الملÙات الاتية لن يتم تشÙيرها:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "إستثناء أنواع الملÙات الاتية من التشÙير: "
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "لا شيء"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index bbe335948c..73ac33ef6f 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 369e400f5f..8b8c2471a5 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 97578e2ef9..70e2c9c9ff 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 58b505fc60..9066fe25fa 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 07c5b6fd22..cdd85e6e09 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index de2dc8b777..a415162350 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "تراجع"
msgid "Unable to remove user"
msgstr "تعذر Øذ٠المستخدم"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "مجموعات"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "إلغاء"
@@ -153,15 +153,15 @@ msgstr "إلغاء"
msgid "add group"
msgstr "اضاÙØ© مجموعة"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "يجب ادخال اسم مستخدم صØÙŠØ"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Øصل خطأ اثناء انشاء مستخدم"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صØÙŠØØ©"
@@ -399,7 +399,7 @@ msgstr "اØصل على التطبيقات لمزامنة ملÙاتك"
msgid "Show First Run Wizard again"
msgstr "ابدأ خطوات بداية التشغيل من جديد"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "كلمة المرور"
@@ -423,7 +423,7 @@ msgstr "كلمات سر جديدة"
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "اسم الØساب"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud ÙÙŠ مدير الملÙات"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "اسم الدخول"
@@ -463,30 +463,34 @@ msgstr "اسم الدخول"
msgid "Create"
msgstr "انشئ"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "ÙˆØدة التخزين الاÙتراضية"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "غير Ù…Øدود"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "شيء آخر"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ÙˆØدة التخزين"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "تغيير اسم الØساب"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "اعداد كلمة مرور جديدة"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "اÙتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 9674f31fb6..2e595ac641 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 7defa1d4b0..0b90ad151d 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <hussein-atef@hotmail.com>, 2012.
-# <shiningmoon25@gmail.com>, 2012.
-# <tarek.taha@gmail.com>, 2013.
+# TYMAH <hussein-atef@hotmail.com>, 2012
+# aboodilankaboot, 2012
+# blackcoder <tarek.taha@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index b35189b41a..5a28e4f3e4 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/be/files.po b/l10n/be/files.po
index de9d057f6a..ac51487cf2 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index e69ef2d14d..229b8b326a 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index 142d2eff37..c6f284fc40 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index 03a80d8b42..b09ac51eb4 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 1953d1cd3d..41c6a308ab 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/files_versions.po b/l10n/be/files_versions.po
index e194db5f43..2ec579f88f 100644
--- a/l10n/be/files_versions.po
+++ b/l10n/be/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 284f8eeb6a..7fe412203c 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ 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"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 9da6989831..77d13b3886 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index b922f51102..9f896e71d1 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/user_webdavauth.po b/l10n/be/user_webdavauth.po
index 9e0304b10b..21fb9c8c46 100644
--- a/l10n/be/user_webdavauth.po
+++ b/l10n/be/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index e2a9f071ad..21545c799d 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 2dbb38e8b9..cc86637f91 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 859b65c0eb..fe26f583d1 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Криптиране"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ÐÑма"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 00fc8947a1..68c2ba58ed 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 7c4ce74f7a..28d6ed9c19 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 4784eccbdd..95abefdf71 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index d01c393db1..1d86aa6d8d 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 9926586c63..b59ef966a8 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 4a48feafd4..bec96510ec 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "възтановÑване"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групи"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Изтриване"
@@ -153,15 +153,15 @@ msgstr "Изтриване"
msgid "add group"
msgstr "нова група"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "Покажи наÑтройките за първоначално зареждане отново"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Парола"
@@ -423,7 +423,7 @@ msgstr "Ðова парола"
msgid "Change password"
msgstr "ПромÑна на паролата"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Екранно име"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Потребител"
@@ -463,30 +463,34 @@ msgstr "Потребител"
msgid "Create"
msgstr "Създаване"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Хранилище по подразбиране"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ðеограничено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Други"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 523a9f3f6b..38caf68df4 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 2d321a7650..fb9b137fdf 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-23 09:40+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 04357e7be9..31b5995fa8 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index ef080f3a2c..53e2fd039b 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index a2ee8c0db4..08c97a096b 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "কোনটিই নয়"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 756e68e648..ac48988b3d 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 1125bc4119..b934234300 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 941d663b7b..2e9364c8c3 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 2edd5f1a35..7bc652b6c8 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index c0026153b0..6977a5cd3f 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 69adcbebf6..a2167f9e17 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "গোষà§à¦ ীসমূহ"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "গোষà§à¦ ী পà§à¦°à¦¶à¦¾à¦¸à¦•"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "মà§à¦›à§‡"
@@ -153,15 +153,15 @@ msgstr "মà§à¦›à§‡"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "পà§à¦°à¦¥à¦®à¦¬à¦¾à¦° চালানোর যাদà§à¦•à¦° পূনরায় পà§à¦°à¦¦à¦°à§à¦¶à¦¨ কর"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "কূটশবà§à¦¦"
@@ -423,7 +423,7 @@ msgstr "নতà§à¦¨ কূটশবà§à¦¦"
msgid "Change password"
msgstr "কূটশবà§à¦¦ পরিবরà§à¦¤à¦¨ করà§à¦¨"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "আপনার ownCloud ঠসংযà§à¦•à§à¦¤ হতে à¦à¦‡ ঠিকানাটি আপনার ফাইল বà§à¦¯à¦¬à¦¸à§à¦¥à¦¾à¦ªà¦•à§‡ বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "তৈরী কর"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ সংরকà§à¦·à¦£à¦¾à¦—ার"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "অসীম"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "সংরকà§à¦·à¦£à¦¾à¦—ার"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 95e7905df4..06e69066c0 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index e5c329e580..1768f6474f 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
+# Shubhra Paul <paul_shubhra@yahoo.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index f507c90fb8..cc8ad021d0 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# rogerc, 2013
+# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -223,7 +224,7 @@ msgstr "Cancel·la"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Error en carregar la plantilla del seleccionador de fitxers"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 04981726ab..7335f12d18 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -262,7 +262,7 @@ msgstr "Desa"
#: templates/index.php:7
msgid "New"
-msgstr "Nova"
+msgstr "Nou"
#: templates/index.php:10
msgid "Text file"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 98fd3185f0..b2b602fcda 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.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-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 10:40+0000\n"
-"Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,77 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Xifrat"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "El xifrat de fitxers està activat."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Els tipus de fitxers següents no es xifraran:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Exclou els tipus de fitxers següents del xifratge:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Cap"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 8891a75a0e..57707cb496 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 74044813bc..dbae0e9248 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 42c6cf5a92..36d1753b85 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 624a5da1e1..c1e4d1db8d 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 0bacb709f9..74675cf556 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 1fdca4c9dc..64eb8eea68 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "desfés"
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grups"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Esborra"
@@ -154,15 +154,15 @@ msgstr "Esborra"
msgid "add group"
msgstr "afegeix grup"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Heu de facilitar un nom d'usuari và lid"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Error en crear l'usuari"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya và lida"
@@ -400,7 +400,7 @@ msgstr "Obtén les aplicacions per sincronitzar fitxers"
msgid "Show First Run Wizard again"
msgstr "Torna a mostrar l'assistent de primera execució"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contrasenya"
@@ -424,7 +424,7 @@ msgstr "Contrasenya nova"
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nom a mostrar"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nom d'accés"
@@ -464,30 +464,34 @@ msgstr "Nom d'accés"
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Emmagatzemament per defecte"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Il·limitat"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Un altre"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Emmagatzemament"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "canvia el nom a mostrar"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "estableix nova contrasenya"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 10f3f0166d..8acfede6fd 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index bcde4299fd..66136ea54a 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <rcalvoi@yahoo.com>, 2012-2013.
+# rogerc, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index be3bbdc893..ab49706a17 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 7a36587eeb..757ea02759 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index af7d094cfb..ab7ce4acce 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Å ifrovánÃ"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifrovánà je povoleno."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "NásledujÃcà typy souborů nebudou Å¡ifrovány:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Vyjmout následujÃcà typy souborů ze Å¡ifrovánÃ:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Žádné"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 927cfd451c..acc653dc36 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index ce9e280736..3e13acd54c 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index a7f3b6ea85..29df8f8843 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 03e51b990a..11930a8b79 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index ad1a269592..89c5471f48 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 64f7c79490..83ef8d81f5 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "zpět"
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Smazat"
@@ -153,15 +153,15 @@ msgstr "Smazat"
msgid "add group"
msgstr "přidat skupinu"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "MusÃte zadat platné uživatelské jméno"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Chyba při vytvářenà užiatele"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "MusÃte zadat platné heslo"
@@ -399,7 +399,7 @@ msgstr "ZÃskat aplikace pro synchronizaci vaÅ¡ich souborů"
msgid "Show First Run Wizard again"
msgstr "Znovu zobrazit průvodce prvnÃm spuÅ¡tÄ›nÃm"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Heslo"
@@ -423,7 +423,7 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Zobrazované jméno"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použijte tuto adresu pro připojenà k vašemu ownCloud skrze správce souborů"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Přihlašovacà jméno"
@@ -463,30 +463,34 @@ msgstr "Přihlašovacà jméno"
msgid "Create"
msgstr "Vytvořit"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Výchozà úložiště"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "NeomezenÄ›"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Jiný"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Úložiště"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "změnit zobrazované jméno"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "nastavit nové heslo"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "VýchozÃ"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 60c1780300..165b5faf3e 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index a7466ca6bf..420758436b 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 7d0fc54707..d179fe43c4 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index e6532a72d4..5c57b58b14 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 0d6bc4131f..abca22ad96 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.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-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:40+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,77 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Amgryptiad"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Galluogwyd amgryptio ffeiliau."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Ni fydd ffeiliau o'r math yma'n cael eu hamgryptio:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Eithrio'r mathau canlynol o ffeiliau rhag cael eu hamgryptio:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Dim"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 8eedfc37f7..c948d12813 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index a7f0caca27..2072c20c29 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 45e6ca9476..79ae4020be 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_versions.po b/l10n/cy_GB/files_versions.po
index 2d178293a3..ee2268ca74 100644
--- a/l10n/cy_GB/files_versions.po
+++ b/l10n/cy_GB/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index e29f1d19e6..b79791a04f 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 4680367639..77867e9ddb 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "dadwneud"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grwpiau"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Dileu"
@@ -153,15 +153,15 @@ msgstr "Dileu"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Cyfrinair"
@@ -423,7 +423,7 @@ msgstr "Cyfrinair newydd"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Arall"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index b8246f1cea..540e4a8bda 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
index 38625a8e00..2f567efac8 100644
--- a/l10n/cy_GB/user_webdavauth.po
+++ b/l10n/cy_GB/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 3d81bf96c9..783b792b27 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 57a44c5f98..3c842f56da 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 9d253656f2..8f86ac81bf 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil kryptering aktiveret."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "De følgende filtyper vil ikke blive krypteret:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder de følgende fil typer fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 3a75895703..ae8fd2d4df 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index a51c29810a..0c457353d8 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 909dec96ad..d288474c11 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 4dcf5e81f4..23356455f8 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 021991572a..420454de10 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 1fc6fbb763..c9d5248fae 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "fortryd"
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Slet"
@@ -154,15 +154,15 @@ msgstr "Slet"
msgid "add group"
msgstr "Tilføj gruppe"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Et gyldigt brugernavn skal angives"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Fejl ved oprettelse af bruger"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
@@ -400,7 +400,7 @@ msgstr "Hent applikationerne for at synkronisere dine filer"
msgid "Show First Run Wizard again"
msgstr "Vis Første Kørsels Guiden igen."
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Kodeord"
@@ -424,7 +424,7 @@ msgstr "Nyt kodeord"
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Skærmnavn"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Loginnavn"
@@ -464,30 +464,34 @@ msgstr "Loginnavn"
msgid "Create"
msgstr "Ny"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard opbevaring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ubegrænset"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Andet"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Opbevaring"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "skift skærmnavn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "skift kodeord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 9639ba3b5f..542012b668 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 0590c136e9..9c0bc594ab 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
+# cronner <cronner@gmail.com>, 2012
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 4d051755e2..247b8373db 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 6c709fddd8..4765111c00 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index caaaa81d2b..6fed59d267 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:54+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Dateiverschlüsselung ist aktiviert"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Schließe die folgenden Dateitypen von der Verschlüsselung aus:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nichts"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 762e9d3486..6476179fc2 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 5662022a29..134980ed79 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index ea4291698a..a620790ecd 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 921aba68c4..24dc734736 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:59+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 6f60dd7fd8..deb1107b94 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index b84c87664b..1cad13645b 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -138,16 +138,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Löschen"
@@ -155,15 +155,15 @@ msgstr "Löschen"
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
@@ -401,7 +401,7 @@ msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
msgid "Show First Run Wizard again"
msgstr "Erstinstallation erneut durchführen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passwort"
@@ -425,7 +425,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Anzeigename"
@@ -457,7 +457,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Loginname"
@@ -465,30 +465,34 @@ msgstr "Loginname"
msgid "Create"
msgstr "Anlegen"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 1d0d538225..cd224bb20e 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index a756a0d857..ff18551f62 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <blobbyjj@ymail.com>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# <mibunrui@gmx.de>, 2013.
-# <seeed@freenet.de>, 2012.
+# Mirodin <blobbyjj@ymail.com>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# AndryXY <mibunrui@gmx.de>, 2013
+# seeed <seeed@freenet.de>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 9a849c6a2b..38b4ca3853 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 9f2775390a..ad5b6855bc 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 6630efe377..0073db8696 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 21:54+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Datei-Verschlüsselung ist aktiviert"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nichts"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 95a49523f0..aec6594f2e 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index ecf16837b2..157ccf0de9 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 7528aa33b1..b9a9e24c81 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 4218653d90..7d3c1a83c4 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 20:39+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 802433b473..badd06466f 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 231673b043..a7b92f7eeb 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -139,16 +139,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Löschen"
@@ -156,15 +156,15 @@ msgstr "Löschen"
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
@@ -402,7 +402,7 @@ msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
msgid "Show First Run Wizard again"
msgstr "Den Einrichtungsassistenten erneut anzeigen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passwort"
@@ -426,7 +426,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Anzeigename"
@@ -458,7 +458,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Loginname"
@@ -466,30 +466,34 @@ msgstr "Loginname"
msgid "Create"
msgstr "Erstellen"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Andere"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 7f49c8e8ea..263a36393e 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 05ec894d85..44670121a4 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <a.tangemann@web.de>, 2012-2013.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# <multimill@gmail.com>, 2012.
-# <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
+# a.tangemann <a.tangemann@web.de>, 2012-2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 404b31bf2c..6f93f9fc42 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 776ae2e521..cb98be6195 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index e3d818fc1b..e0ad9229a4 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ΚÏυπτογÏάφηση"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Η κÏυπτογÏάφηση αÏχείων είναι ενεÏγή."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Οι παÏακάτω Ï„Ïποι αÏχείων δεν θα κÏυπτογÏαφηθοÏν:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "ΕξαίÏεση των παÏακάτω Ï„Ïπων αÏχείων από την κÏυπτογÏάφηση:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Τίποτα"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index cc6ffbfcf0..6d82b8d167 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index b963f18ed1..009eb5a811 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index 09dfdf6d4a..658ee7bd3c 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 12369ab3d4..c0a78762a8 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 66fdcec8a4..329bed83b0 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index b5ee78199a..f073289261 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "αναίÏεση"
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίÏεση χÏήστη"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Ομάδες"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Ομάδα ΔιαχειÏιστών"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ΔιαγÏαφή"
@@ -154,15 +154,15 @@ msgstr "ΔιαγÏαφή"
msgid "add group"
msgstr "Ï€Ïοσθήκη ομάδας"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Î ÏÎπει να δοθεί ÎγκυÏο όνομα χÏήστη"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Σφάλμα δημιουÏγίας χÏήστη"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό"
@@ -400,7 +400,7 @@ msgstr "Λήψη της εφαÏμογής για συγχÏονισμό των
msgid "Show First Run Wizard again"
msgstr "Î Ïοβολή Î Ïώτης ΕκτÎλεσης ÎŸÎ´Î·Î³Î¿Ï Ï€Î¬Î»Î¹"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Συνθηματικό"
@@ -424,7 +424,7 @@ msgstr "ÎÎο συνθηματικό"
msgid "Change password"
msgstr "Αλλαγή συνθηματικοÏ"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Όνομα εμφάνισης"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ΧÏήση αυτής της διεÏθυνσης για σÏνδεση στο ownCloud με τον διαχειÏιστή αÏχείων σας"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Όνομα ΣÏνδεσης"
@@ -464,30 +464,34 @@ msgstr "Όνομα ΣÏνδεσης"
msgid "Create"
msgstr "ΔημιουÏγία"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Î ÏοκαθοÏισμÎνη Αποθήκευση "
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ΑπεÏιόÏιστο"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Άλλο"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Αποθήκευση"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "αλλαγή ονόματος εμφάνισης"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "επιλογή νÎου κωδικοÏ"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Î ÏοκαθοÏισμÎνο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 39de6e98c6..50a8f739da 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index 370f455b11..3a75e3ceae 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
-# Marios Bekatoros <>, 2013.
+# Dimitris M. <monopatis@gmail.com>, 2012
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2012
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012
+# Marios Bekatoros <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 48961fc2a5..63750feeb3 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 04:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -213,26 +213,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index c3f62f9571..b4d090e23a 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index a45b177914..e436edc61e 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.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-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
index fefa9ba8f7..a7724b86be 100644
--- a/l10n/en@pirate/files_external.po
+++ b/l10n/en@pirate/files_external.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index c8e6a64b2e..524b1b909a 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 9fd846e695..3ae46bccb4 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/en@pirate/files_versions.po b/l10n/en@pirate/files_versions.po
index b1e0a380e9..2df316a892 100644
--- a/l10n/en@pirate/files_versions.po
+++ b/l10n/en@pirate/files_versions.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 73994aee80..be031f5ebd 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index ef0b0c8304..2dd26cf0d9 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.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-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passcode"
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 9e9a16cb2c..ffa7973ace 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/user_webdavauth.po b/l10n/en@pirate/user_webdavauth.po
index 18917231eb..055e077694 100644
--- a/l10n/en@pirate/user_webdavauth.po
+++ b/l10n/en@pirate/user_webdavauth.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2012-11-09 09:06+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 0ed73ec376..7e9696f698 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 9e476a415a..27aa6ec0b5 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 8b1ceb53a9..244d63f3b0 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Ĉifrado"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenio"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 915ab9e130..bc3498cba6 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index c1815327db..b42b5a067f 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index e30b73af02..1c6009954f 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index f3fddd5909..afca16226f 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 7b7db0ac13..6c9aa9d71e 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index ea11dc41a8..8d4c3eddd7 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "malfari"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Forigi"
@@ -153,15 +153,15 @@ msgstr "Forigi"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Pasvorto"
@@ -423,7 +423,7 @@ msgstr "Nova pasvorto"
msgid "Change password"
msgstr "ÅœanÄi la pasvorton"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Krei"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "DefaÅlta konservejo"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Senlima"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Alia"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Konservejo"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "DefaÅlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 305aa9ebd8..7c9235b4e1 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index 8217ee0e2b..aa3b42b411 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mariano <mstreet@kde.org.ar>, 2013.
-# Mariano <mstreet@kde.org.ar>, 2012.
+# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index bcbb2c83cc..61828126fd 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,13 +6,14 @@
# ggam <ggam@brainleakage.com>, 2013
# msoko <sokolovitch@yahoo.com>, 2013
# iGerli <stefano@aerosoles.net>, 2013
+# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: ggam <ggam@brainleakage.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: xhiena <xhiena@gmail.com>\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"
@@ -225,7 +226,7 @@ msgstr "Cancelar"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Error cargando la plantilla del seleccionador de archivos"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index f6922124d9..b959c11dfa 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index b2a20b26ea..d6c76e9dba 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La encriptacion de archivo esta activada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Los siguientes tipos de archivo no seran encriptados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir los siguientes tipos de archivo de la encriptacion:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ninguno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 435a62fe2f..61bc450c87 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 55007656ed..a371882b62 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index c51f723c6c..6d0aaf7696 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 5fc70f6e2a..89307a3c01 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 9affc11972..3dcdad6129 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: xhiena <xhiena@gmail.com>\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"
@@ -123,7 +124,7 @@ msgstr "Tiene que ingresar una cuenta existente o la del administrador."
#: setup.php:155
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "No se pudo establecer la conexión a Oracle"
#: setup.php:237
msgid "MySQL username and/or password not valid"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 04074a0a42..34b0d4d380 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: ggam <ggam@brainleakage.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -138,16 +138,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "No se puede eliminar el usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo administrador"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eliminar"
@@ -155,15 +155,15 @@ msgstr "Eliminar"
msgid "add group"
msgstr "añadir Grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Se debe usar un nombre de usuario válido"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Error al crear usuario"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Se debe usar una contraseña valida"
@@ -401,7 +401,7 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar asistente para iniciar otra vez"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contraseña"
@@ -425,7 +425,7 @@ msgstr "Nueva contraseña"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nombre a mostrar"
@@ -457,7 +457,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nombre de usuario"
@@ -465,30 +465,34 @@ msgstr "Nombre de usuario"
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Almacenamiento predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Otro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Cambiar nombre a mostrar"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 60ce98ad43..9f85de4c0d 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -5,13 +5,14 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# ordenet <roberto@ordenet.com>, 2013
+# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
+"Last-Translator: xhiena <xhiena@gmail.com>\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"
@@ -21,7 +22,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Ocurrió un fallo al borrar las asignaciones."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -49,7 +50,7 @@ msgstr "Falló el borrado"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr "Hacerse cargo de los ajustes de configuración del servidor reciente?"
+msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
#: js/settings.js:83
msgid "Keep settings?"
@@ -61,7 +62,7 @@ msgstr "No se puede añadir la configuración del servidor"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "Asignaciones borradas"
#: js/settings.js:112
msgid "Success"
@@ -92,7 +93,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
+msgstr "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
#: templates/settings.php:12
msgid ""
@@ -162,7 +163,7 @@ msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid rempla
#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
+msgstr "usar %%uid como comodÃn, ej: \"uid=%%uid\""
#: templates/settings.php:56
msgid "User List Filter"
@@ -174,7 +175,7 @@ msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin placeholder, ej: \"objectClass=person\"."
+msgstr "Sin comodines, ej: \"objectClass=person\"."
#: templates/settings.php:61
msgid "Group Filter"
@@ -186,11 +187,11 @@ msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
+msgstr "sin comodines, ej: \"objectClass=posixGroup\"."
#: templates/settings.php:69
msgid "Connection Settings"
-msgstr "Configuracion de coneccion"
+msgstr "Configuración de conexión"
#: templates/settings.php:71
msgid "Configuration Active"
@@ -206,17 +207,17 @@ msgstr "Puerto"
#: templates/settings.php:73
msgid "Backup (Replica) Host"
-msgstr "Host para backup (Replica)"
+msgstr "Servidor de copia de seguridad (Replica)"
#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
-msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
+msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
#: templates/settings.php:74
msgid "Backup (Replica) Port"
-msgstr "Puerto para backup (Replica)"
+msgstr "Puerto para copias de seguridad (Replica)"
#: templates/settings.php:75
msgid "Disable Main Server"
@@ -224,7 +225,7 @@ msgstr "Deshabilitar servidor principal"
#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
+msgstr "Cuando se inicie, ownCloud unicamente conectará al servidor replica"
#: templates/settings.php:76
msgid "Use TLS"
@@ -232,11 +233,11 @@ msgstr "Usar TLS"
#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
+msgstr "No lo use para conexiones LDAPS, Fallará."
#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
-msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
+msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)"
#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
@@ -258,7 +259,7 @@ msgstr "Cache TTL"
#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
-msgstr "en segundos. Un cambio vacÃa la cache."
+msgstr "en segundos. Un cambio vacÃa la caché."
#: templates/settings.php:81
msgid "Directory Settings"
@@ -360,15 +361,15 @@ msgid ""
"achieve a similar behaviour as before ownCloud 5 enter the user display name"
" attribute in the following field. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Por defecto el nombre de usuario interno será creado desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente quitados. En coincidencias un número será añadido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es también el nombre por defecto para la carpeta personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. Déjalo vacÃo para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP."
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atributo Nombre de usuario Interno:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "Sobrescribir la detección UUID"
#: templates/settings.php:105
msgid ""
@@ -379,15 +380,15 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behaviour. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los nuevos usuarios y grupos de LDAP."
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atributo UUID:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Asignación del Nombre de usuario de un usuario LDAP"
#: templates/settings.php:108
msgid ""
@@ -402,15 +403,15 @@ msgid ""
"configuration sensitive, it affects all LDAP configurations! Do never clear "
"the mappings in a production environment. Only clear mappings in a testing "
"or experimental stage."
-msgstr "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental."
+msgstr "ownCloud utiliza nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental."
#: templates/settings.php:109
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
#: templates/settings.php:109
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
#: templates/settings.php:111
msgid "Test Configuration"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 305a875650..9b520ddeaa 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-# Art O. Pal <artopal@fastmail.fm>, 2012.
-# <pggx999@gmail.com>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2012
+# pggx999 <pggx999@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index e4e0a5550b..11a4e5dcb9 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index a6178d4834..9ac2ead527 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 08c82d2bc8..8dccd67247 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Encriptación"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La encriptación de archivos no está habilitada"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Los siguientes tipos de archivos no serán encriptados"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir los siguientes tipos de archivos de encriptación:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ninguno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 14fa3cdbff..922592fcfd 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 1e7b677a93..09cbf34968 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 433e065a7c..0090b05bfd 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 623368fabe..956dd59f21 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 0c4628ce5d..6607a5c37b 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index d2e301928f..e5949fdc99 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible remover usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Borrar"
@@ -154,15 +154,15 @@ msgstr "Borrar"
msgid "add group"
msgstr "Agregar grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Debe ingresar un nombre de usuario válido"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Error creando usuario"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Debe ingresar una contraseña válida"
@@ -400,7 +400,7 @@ msgstr "Obtené aplicaciones para sincronizar tus archivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar de nuevo el asistente de primera ejecución"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contraseña"
@@ -424,7 +424,7 @@ msgstr "Nueva contraseña:"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nombre a mostrar"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nombre de "
@@ -464,30 +464,34 @@ msgstr "Nombre de "
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Almacenamiento Predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Otros"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Cambiar el nombre que se muestra"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 701428e5ae..3e7f15f0e2 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 2d5007b68e..752a64616b 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-# <claudio.tessone@gmail.com>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012
+# cjtess <claudio.tessone@gmail.com>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 44a8a4e36b..c2fc834e59 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -224,7 +224,7 @@ msgstr "Loobu"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Viga failivalija malli laadimisel"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 025cdc35cf..832fe2132e 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 9850a24ab4..f6d7f0ebaa 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:12+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Krüpteerimine"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Faili krüpteerimine on sisse lülitatud."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Järgnevaid failitüüpe ei krüpteerita:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Järgnevaid failitüüpe ei krüpteerita:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Pole"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 347a4b9d54..ccc0445389 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 90d63ed0ae..e78843e5d9 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 632d1ffb0f..3cfda325dd 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 570e7d1253..6be6fc45ff 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:20+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 15363d6f0e..752eb631e1 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -124,7 +125,7 @@ msgstr "Sisesta kas juba olemasolev konto või administrator."
#: setup.php:155
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Ei suuda luua ühendust Oracle baasiga"
#: setup.php:237
msgid "MySQL username and/or password not valid"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 6162b117d9..ad01c7a3f1 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "tagasi"
msgid "Unable to remove user"
msgstr "Kasutaja eemaldamine ebaõnnestus"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupid"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupi admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Kustuta"
@@ -154,15 +154,15 @@ msgstr "Kustuta"
msgid "add group"
msgstr "lisa grupp"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Sisesta nõuetele vastav kasutajatunnus"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Viga kasutaja loomisel"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
@@ -400,7 +400,7 @@ msgstr "Hangi rakendusi failide sünkroniseerimiseks"
msgid "Show First Run Wizard again"
msgstr "Näita veelkord Esmase Käivituse Juhendajat"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parool"
@@ -424,7 +424,7 @@ msgstr "Uus parool"
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Näidatav nimi"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Kasutajanimi"
@@ -464,30 +464,34 @@ msgstr "Kasutajanimi"
msgid "Create"
msgstr "Lisa"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Vaikimisi maht"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Piiramatult"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Muu"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Maht"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "muuda näidatavat nime"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "määra uus parool"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 8ced5675c1..194455c637 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index b1ac57ddbf..ee2a1e41f4 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.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-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 19:19+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 1678d02561..918df02676 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index b63a4ea80e..edbc4c3d35 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 40ebdc5fdf..d329a7d7a2 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Enkriptazioa"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fitxategien enkriptazioa gaituta dago."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Hurrengo fitxategi motak ez dira enkriptatuko:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Baztertu hurrengo fitxategi motak enkriptatzetik:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ezer"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index c1517d8e38..6b33e53c9f 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 7b2e073f37..d060b0a940 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index d0cad8e270..56efcb5590 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index c7a497b929..284ceaf733 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 0fb97f4caf..3e161e5af7 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 5564b94a31..de7d09fb66 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "desegin"
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Ezabatu"
@@ -153,15 +153,15 @@ msgstr "Ezabatu"
msgid "add group"
msgstr "gehitu taldea"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Baliozko erabiltzaile izena eman behar da"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Errore bat egon da erabiltzailea sortzean"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
@@ -399,7 +399,7 @@ msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
msgid "Show First Run Wizard again"
msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Pasahitza"
@@ -423,7 +423,7 @@ msgstr "Pasahitz berria"
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Bistaratze Izena"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Sarrera Izena"
@@ -463,30 +463,34 @@ msgstr "Sarrera Izena"
msgid "Create"
msgstr "Sortu"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Lehenetsitako Biltegiratzea"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Mugarik gabe"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Bestelakoa"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Biltegiratzea"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "aldatu bistaratze izena"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ezarri pasahitz berria"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a86914e471..63d357b112 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index 7128f70cb6..c9297b3ff2 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <asieriko@gmail.com>, 2013.
-# <asieriko@gmail.com>, 2012.
+# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index dc320638bd..b65d129533 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index b16787e022..10a3bb10e4 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index fef3cfd192..bd0e9ee416 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "رمزگذاری"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "رمزنگاری Ùایلها Ùعال شد."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Ùایلهای زیر رمزنگاری نخواهند شد:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ùایلهای زیر از رمزنگاری نادیده گرÙته Ù…ÛŒ شوند:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "هیچ‌کدام"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 316ca3fb55..2e5205fde2 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index f23556b137..6921b1cfc3 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index a246816ff7..64e654b7e8 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 15fe4b1b74..1917353992 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 62b626ded1..4d1be2c3f6 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 373f6ca85e..9f85ece592 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "بازگشت"
msgid "Unable to remove user"
msgstr "Øذ٠کاربر امکان پذیر نیست"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "گروه ها"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ØØ°Ù"
@@ -153,15 +153,15 @@ msgstr "ØØ°Ù"
msgid "add group"
msgstr "اÙزودن گروه"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "نام کاربری صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "خطا در ایجاد کاربر"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "رمز عبور صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود"
@@ -399,7 +399,7 @@ msgstr "برنامه ها را دریاÙت کنید تا Ùایل هایتان
msgid "Show First Run Wizard again"
msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "گذرواژه"
@@ -423,7 +423,7 @@ msgstr "گذرواژه جدید"
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "نام نمایشی"
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت Ùایل خودتان استÙاده کنید"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "نام کاربری"
@@ -463,30 +463,34 @@ msgstr "نام کاربری"
msgid "Create"
msgstr "ایجاد کردن"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "ذخیره سازی پیش Ùرض"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "نامØدود"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "دیگر"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ØاÙظه"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "تغییر نام نمایشی"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "تنظیم کلمه عبور جدید"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "پیش Ùرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 1d8c8ce4b6..291214be8b 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 5b69bafee6..f89e5c1feb 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index ec04afbad4..ff1cb94e44 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 0625ba07dd..67ef673fa9 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi/files_encryption.po b/l10n/fi/files_encryption.po
index 8aa6088c38..a650f8bc90 100644
--- a/l10n/fi/files_encryption.po
+++ b/l10n/fi/files_encryption.po
@@ -7,28 +7,87 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/fi/files_external.po b/l10n/fi/files_external.po
index d37cbbef37..3281188f3b 100644
--- a/l10n/fi/files_external.po
+++ b/l10n/fi/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,90 +17,107 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
msgid "Access granted"
msgstr ""
-#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
msgid "Error configuring Dropbox storage"
msgstr ""
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+#: js/dropbox.js:65 js/google.js:66
msgid "Grant access"
msgstr ""
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr ""
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
msgstr ""
-#: js/google.js:26 js/google.js:73 js/google.js:78
+#: js/google.js:36 js/google.js:93
msgid "Error configuring Google Drive storage"
msgstr ""
+#: lib/config.php:431
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:437
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
-#: templates/settings.php:7 templates/settings.php:19
-msgid "Mount point"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
msgstr ""
-#: templates/settings.php:8
-msgid "Backend"
+#: templates/settings.php:10
+msgid "External storage"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:11
msgid "Configuration"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:12
msgid "Options"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:13
msgid "Applicable"
msgstr ""
-#: templates/settings.php:23
-msgid "Add mount point"
+#: templates/settings.php:33
+msgid "Add storage"
msgstr ""
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:90
msgid "None set"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:91
msgid "All Users"
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:92
msgid "Groups"
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:100
msgid "Users"
msgstr ""
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:129
msgid "Enable User External Storage"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:141
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:113
+#: templates/settings.php:159
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index fcba73eea4..ce314f8d2a 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9
+#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:11
+#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
msgid "Download"
msgstr ""
-#: templates/public.php:29
+#: templates/public.php:40
msgid "No preview available for"
msgstr ""
-#: templates/public.php:37
+#: templates/public.php:50
msgid "web services under your control"
msgstr ""
diff --git a/l10n/fi/files_trashbin.po b/l10n/fi/files_trashbin.po
new file mode 100644
index 0000000000..7cf44f62a8
--- /dev/null
+++ b/l10n/fi/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:175 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:184
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:196
+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 ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/fi/files_versions.po b/l10n/fi/files_versions.po
index 7317ba1f3e..12a72b999d 100644
--- a/l10n/fi/files_versions.po
+++ b/l10n/fi/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,41 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:16
-msgid "History"
+#: history.php:40
+msgid "success"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
+#: 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:69
+msgid "No old versions available"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: history.php:74
+msgid "No path specified"
msgstr ""
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:6
+msgid "Versions"
msgstr ""
-#: templates/settings.php:4
-msgid "Enable"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index 8996a10489..a315271139 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 4be7031174..1e9abc85b8 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,86 +17,163 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
-#: ajax/creategroup.php:19
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:19
msgid "Unable to add group"
msgstr ""
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:11
msgid "Could not enable app. "
msgstr ""
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
msgid "Invalid email"
msgstr ""
-#: ajax/openid.php:16
-msgid "OpenID Changed"
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
msgstr ""
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
msgstr ""
-#: ajax/removegroup.php:16
-msgid "Unable to delete group"
+#: ajax/setlanguage.php:15
+msgid "Language changed"
msgstr ""
-#: ajax/removeuser.php:22
-msgid "Unable to delete user"
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
msgstr ""
-#: ajax/setlanguage.php:18
-msgid "Language changed"
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
msgstr ""
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
msgstr ""
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:28 js/apps.js:65
+#: 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:28 js/apps.js:54
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
msgid "Enable"
msgstr ""
-#: js/personal.js:69
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:93
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:96
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: personal.php:47 personal.php:48
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:160
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:428
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:429 js/users.js:435 js/users.js:450
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:434
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
-#: templates/admin.php:14
+#: templates/admin.php:15
msgid "Security Warning"
msgstr ""
-#: templates/admin.php:17
+#: 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 "
@@ -105,71 +182,153 @@ msgid ""
" webserver document root."
msgstr ""
-#: templates/admin.php:31
+#: 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 <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"This ownCloud server can't set system locale to %s. This means that there "
+"might be problems with certain characters in file names. We strongly suggest"
+" to install the required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+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:92
msgid "Cron"
msgstr ""
-#: templates/admin.php:37
+#: templates/admin.php:101
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:43
+#: templates/admin.php:111
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:49
+#: templates/admin.php:121
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:56
+#: templates/admin.php:128
msgid "Sharing"
msgstr ""
-#: templates/admin.php:61
+#: templates/admin.php:134
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:135
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:67
+#: templates/admin.php:142
msgid "Allow links"
msgstr ""
-#: templates/admin.php:68
+#: templates/admin.php:143
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:73
+#: templates/admin.php:150
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:74
+#: templates/admin.php:151
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:79
+#: templates/admin.php:158
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:81
+#: templates/admin.php:161
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:88
+#: templates/admin.php:168
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:181
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:182
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:185
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:195
msgid "Log"
msgstr ""
-#: templates/admin.php:116
+#: templates/admin.php:196
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:227
msgid "More"
msgstr ""
-#: templates/admin.php:124
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -179,143 +338,159 @@ msgid ""
"License\">AGPL</abbr></a>."
msgstr ""
-#: templates/apps.php:10
+#: templates/apps.php:11
msgid "Add your App"
msgstr ""
-#: templates/apps.php:11
+#: templates/apps.php:12
msgid "More Apps"
msgstr ""
-#: templates/apps.php:27
+#: templates/apps.php:28
msgid "Select an App"
msgstr ""
-#: templates/apps.php:31
+#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
msgstr ""
-#: templates/apps.php:32
+#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/apps.php:38
+msgid "Update"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:23
-msgid "Problems connecting to help database."
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
msgstr ""
-#: templates/help.php:24
-msgid "Go there manually."
+#: templates/help.php:14
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:32
-msgid "Answer"
+#: templates/help.php:17
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
msgstr ""
-#: templates/personal.php:13
-msgid "Download"
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+msgid "Password"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:38
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:39
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:40
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:42
msgid "New password"
msgstr ""
-#: templates/personal.php:23
-msgid "show"
+#: templates/personal.php:44
+msgid "Change password"
msgstr ""
-#: templates/personal.php:24
-msgid "Change password"
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:68
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:70
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:71
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:77 templates/personal.php:78
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:94
+msgid "WebDAV"
msgstr ""
-#: templates/users.php:21 templates/users.php:76
-msgid "Name"
+#: templates/personal.php:96
+msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
+#: templates/users.php:21 templates/users.php:80
+msgid "Login Name"
msgstr ""
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
-msgid "Groups"
+#: templates/users.php:30
+msgid "Create"
msgstr ""
-#: templates/users.php:32
-msgid "Create"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
+msgid "Default Storage"
msgstr ""
-#: templates/users.php:35
-msgid "Default Quota"
+#: templates/users.php:44 templates/users.php:138
+msgid "Unlimited"
msgstr ""
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:80 templates/users.php:112
-msgid "Group Admin"
+#: templates/users.php:87
+msgid "Storage"
msgstr ""
-#: templates/users.php:82
-msgid "Quota"
+#: templates/users.php:98
+msgid "change display name"
msgstr ""
-#: templates/users.php:146
-msgid "Delete"
+#: templates/users.php:102
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:133
+msgid "Default"
msgstr ""
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
index 5f8865fafa..cd2c388c98 100644
--- a/l10n/fi/user_ldap.po
+++ b/l10n/fi/user_ldap.po
@@ -7,164 +7,413 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:8
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:18
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:19
-msgid "Base Group Tree"
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
msgstr ""
-#: templates/settings.php:20
-msgid "Group-Member association"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
-msgid "Do not use it for SSL connections, it will fail."
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/fi/user_webdavauth.po b/l10n/fi/user_webdavauth.po
new file mode 100644
index 0000000000..9f3a7c03ab
--- /dev/null
+++ b/l10n/fi/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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/fi_FI/core.po b/l10n/fi_FI/core.po
index e2afacc780..8e75917810 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 35eb801053..b203078f77 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 8e9d79de1f..2895592bdc 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Salaus"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Tiedostojen salaus on käytössä."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Seuraavia tiedostotyyppejä ei salata:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Älä salaa seuravia tiedostotyyppejä:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ei mitään"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index edd382a35e..03be39502c 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 3b9d716daf..1e669de89d 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 851ab24cd6..3b9804b01c 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index f29c46f457..c93ead204d 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 14b138f950..8a83621a29 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 6ff0246e51..283aa23af9 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "kumoa"
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Poista"
@@ -154,15 +154,15 @@ msgstr "Poista"
msgid "add group"
msgstr "lisää ryhmä"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Virhe käyttäjää luotaessa"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Salasana"
@@ -424,7 +424,7 @@ msgstr "Uusi salasana"
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Näyttönimi"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Kirjautumisnimi"
@@ -464,30 +464,34 @@ msgstr "Kirjautumisnimi"
msgid "Create"
msgstr "Luo"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Oletustallennustila"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Rajoittamaton"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Muu"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Tallennustila"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "vaihda näyttönimi"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "aseta uusi salasana"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index d4087f7e42..546ad400ad 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index ef62c35b8a..0361107193 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 89298278d5..f33e69d38f 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: msoko <sokolovitch@yahoo.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 3bea1fc06d..043584249e 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index a39633b451..ca51aab0f6 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Chiffrement"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Le chiffrement des fichiers est activé"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Les fichiers de types suivants ne seront pas chiffrés :"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants :"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Aucun"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 6426a14ef8..a014ba452c 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 72d0af006b..8b1f088ee7 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 699ddf1fa0..5f9fde21ee 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 9dd1fa7ce3..dd91318cfb 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index fc6f5e5ae5..912f2f2869 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 755128df72..47d36ce754 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "annuler"
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Supprimer"
@@ -154,15 +154,15 @@ msgstr "Supprimer"
msgid "add group"
msgstr "ajouter un groupe"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Un nom d'utilisateur valide doit être saisi"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Erreur lors de la création de l'utilisateur"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
@@ -400,7 +400,7 @@ msgstr "Obtenez les applications de synchronisation de vos fichiers"
msgid "Show First Run Wizard again"
msgstr "Revoir le premier lancement de l'installeur"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Mot de passe"
@@ -424,7 +424,7 @@ msgstr "Nouveau mot de passe"
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nom affiché"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nom de la connexion"
@@ -464,30 +464,34 @@ msgstr "Nom de la connexion"
msgid "Create"
msgstr "Créer"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Support de stockage par défaut"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Illimité"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Autre"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Support de stockage"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Changer le nom affiché"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Changer le mot de passe"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 4067405dd2..842ea4ffd9 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: plachance <patlachance@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 8fdd18d7e5..d1834912d7 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013.
-# <mishka.lazzlo@gmail.com>, 2013.
-# <nicolas@shivaserv.fr>, 2012.
-# Robert Di Rosa <>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2013
+# mishka <mishka.lazzlo@gmail.com>, 2013
+# ouafnico <nicolas@shivaserv.fr>, 2012
+# Robert Di Rosa <>, 2012
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 3a992b1ece..50c6e6c5f6 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -223,7 +223,7 @@ msgstr "Cancelar"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 8b39cf6301..32363f8b96 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index deed371c80..53d8a1f9b1 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "O cifrado de ficheiros está activado"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes tipos de ficheiros non van seren cifrados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "ExcluÃr os seguintes tipos de ficheiros do cifrado:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ningún"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 5353e0077d..38f4ed5da9 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 90d51ee3cf..dd3de23a2e 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index ecaed1a19b..dd65678ec6 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index b7440fc633..be763534a5 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index e5cf1f4955..50078ca2db 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +124,7 @@ msgstr "Deberá introducir unha conta existente ou o administrador."
#: setup.php:155
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Non foi posÃbel estabelecer a conexión con Oracle"
#: setup.php:237
msgid "MySQL username and/or password not valid"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 74c09165be..97102e6ae9 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Non é posÃbel retirar o usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eliminar"
@@ -154,15 +154,15 @@ msgstr "Eliminar"
msgid "add group"
msgstr "engadir un grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Debe fornecer un nome de usuario"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Produciuse un erro ao crear o usuario"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Debe fornecer un contrasinal"
@@ -400,7 +400,7 @@ msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
msgid "Show First Run Wizard again"
msgstr "Amosar o axudante da primeira execución outra vez"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contrasinal"
@@ -424,7 +424,7 @@ msgstr "Novo contrasinal"
msgid "Change password"
msgstr "Cambiar o contrasinal"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Amosar o nome"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome de acceso"
@@ -464,30 +464,34 @@ msgstr "Nome de acceso"
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Almacenamento predeterminado"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Sen lÃmites"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Almacenamento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "cambiar o nome visÃbel"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "estabelecer un novo contrasinal"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 49b8fa8f96..ff7219da90 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 89f599a0be..779cbf82ba 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <mbouzada@gmail.com>, 2013.
-# <mbouzada@gmail.com>, 2012.
-# Miguel Branco, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013.
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2012
+# Miguel Branco, 2012
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 0af74d8309..ccc4290d4e 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index abb7b0cc67..79e992c88f 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 2d25899318..23f92e54c1 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "×”×¦×¤× ×”"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "כלו×"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 9a1d53589b..ac4482459c 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index c9c3852419..265ce1360e 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index dfdeec5351..31008260ab 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index e39843a6d4..b6e191d237 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 0f47beffef..090576d578 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index e3beab8096..94c0c927b0 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "ביטול"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "קבוצות"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "×ž× ×”×œ הקבוצה"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "מחיקה"
@@ -153,15 +153,15 @@ msgstr "מחיקה"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr "השג ×ת ×”×פליקציות על ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ×ת הקבצ
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "סיסמ×"
@@ -423,7 +423,7 @@ msgstr "ססמה חדשה"
msgid "Change password"
msgstr "×©×™× ×•×™ ססמה"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "השתמש בכתובת ×–×ת על ×ž× ×ª להתחבר ×ל ownCloud דרך סייר קבצי×."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "יצירה"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "×חר"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 7612e8edea..ceab275c3f 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index a1956eff5d..43d52925cb 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 7b7465c414..89fc47d284 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 9474cdb73f..4fbd84f199 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 1c0263d2b3..c362c343cb 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index befaf1f2c9..d437731724 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index d56df17b30..5a9ccbc09e 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index ad93e8681d..6c057b0c24 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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 66568383a7..e3697cd451 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index b6ed4f2b48..9792ca8cbc 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index b8210ac04b..c81fb256e3 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "पासवरà¥à¤¡"
@@ -423,7 +423,7 @@ msgstr "नया पासवरà¥à¤¡"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 9b539eea4a..2bcde19cb2 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index c6cb2a2413..712626e49c 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 9471638d9f..7a6dae0c2d 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index d85601532c..5170e22c07 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index ba59607422..bb0d55ddf2 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 6eef1684f4..b4d561b5be 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 6a0b1c13e7..7f50527558 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 7c054264c4..e0317ae8d3 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 6004430d18..4a55674bbd 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 98511a6ff2..e64e4a8d3d 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index f86beb7215..dbbaaba717 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "vrati"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupa Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Obriši"
@@ -153,15 +153,15 @@ msgstr "Obriši"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lozinka"
@@ -423,7 +423,7 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Izradi"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "ostali"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index ec2531ec06..b6b20e974e 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index c9f410b1ad..bc4382e068 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index e077229e9a..ee92d52364 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 11ac1f30c0..79cb7eabaa 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 319463b638..5df77c3458 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "TitkosÃtás"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Az állományok titkosÃtása be van kapcsolva."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "A következÅ‘ fájltÃpusok nem kerülnek titkosÃtásra:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Zárjuk ki a titkosÃtásból a következÅ‘ fájltÃpusokat:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Egyik sem"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 45c8d923e2..91d88fed96 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 56e7f66070..411f8ee770 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 3b66e1260b..4975db5ce2 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index c10a67b3b8..39f58c0a5d 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index a03140c35c..bd672de992 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 357d84fe56..608dcabc06 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "visszavonás"
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolÃtáni"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Törlés"
@@ -154,15 +154,15 @@ msgstr "Törlés"
msgid "add group"
msgstr "csoport hozzáadása"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Érvényes felhasználónevet kell megadnia"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "A felhasználó nem hozható létre"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
@@ -400,7 +400,7 @@ msgstr "Töltse le az állományok szinkronizációjához szükséges programoka
msgid "Show First Run Wizard again"
msgstr "Nézzük meg újra az elsÅ‘ bejelentkezéskori segÃtséget!"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Jelszó"
@@ -424,7 +424,7 @@ msgstr "Az új jelszó"
msgid "Change password"
msgstr "A jelszó megváltoztatása"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "A megjelenÃtett név"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ennek a cÃmnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelÅ‘jével is is elérheti az állományait."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Bejelentkezési név"
@@ -464,30 +464,34 @@ msgstr "Bejelentkezési név"
msgid "Create"
msgstr "Létrehozás"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Alapértelmezett tárhely"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Korlátlan"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Más"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Tárhely"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "a megjelenÃtett név módosÃtása"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "új jelszó beállÃtása"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 1cfe317651..eaa8597a0d 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 535e53af33..e2056a92ca 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Akos <nagy.akos@libreoffice.ro>, 2013.
+# akoscomp <nagy.akos@libreoffice.ro>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f393e4f5a2..e738115c1e 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 72daa086dd..ba7c214a9c 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 00b039ad39..58e5d4de2e 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,28 +7,87 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:3
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 245e624257..aed614ea01 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index c39089bded..a581a2284b 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index afbe098759..6b027b829f 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
index 4caf1f1827..7e959a096a 100644
--- a/l10n/hy/files_versions.po
+++ b/l10n/hy/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,41 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:16
-msgid "History"
+#: history.php:40
+msgid "success"
msgstr ""
-#: templates/settings-personal.php:4
-msgid "Versions"
+#: 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:69
+msgid "No old versions available"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: history.php:74
+msgid "No path specified"
msgstr ""
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:6
+msgid "Versions"
msgstr ""
-#: templates/settings.php:4
-msgid "Enable"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index a6359330b3..a40365032a 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,61 +7,65 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:295
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:300
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:305
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:312
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:314
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:280
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:281
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:281 files.php:306
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:305
+#: files.php:239
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:63 json.php:75
+#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
msgstr ""
@@ -69,57 +73,173 @@ msgstr ""
msgid "Token expired. Please reload page."
msgstr ""
-#: template.php:86
+#: 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:55
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup.php:58
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup.php:61
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup.php:64
+#, php-format
+msgid "%s set the database host."
+msgstr ""
+
+#: setup.php:132 setup.php:329 setup.php:374
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:238
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:237
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:309
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:314
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:315
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:644
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:867
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:868
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template.php:113
msgid "seconds ago"
msgstr ""
-#: template.php:87
+#: template.php:114
msgid "1 minute ago"
msgstr ""
-#: template.php:88
+#: template.php:115
#, php-format
msgid "%d minutes ago"
msgstr ""
-#: template.php:91
+#: 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:92
+#: template.php:119
msgid "yesterday"
msgstr ""
-#: template.php:93
+#: template.php:120
#, php-format
msgid "%d days ago"
msgstr ""
-#: template.php:94
+#: template.php:121
msgid "last month"
msgstr ""
-#: template.php:95
-msgid "months ago"
+#: template.php:122
+#, php-format
+msgid "%d months ago"
msgstr ""
-#: template.php:96
+#: template.php:123
msgid "last year"
msgstr ""
-#: template.php:97
+#: template.php:124
msgid "years ago"
msgstr ""
-#: updater.php:66
+#: vcategories.php:188 vcategories.php:249
#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:68
-msgid "up to date"
-msgstr ""
-
-#: updater.php:71
-msgid "updates check is disabled"
+msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 4d039f2ea6..aa40a478e9 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
@@ -153,15 +153,15 @@ msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Ô±ÕµÕ¬"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 438a2108b7..b85c44b15c 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,164 +7,413 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings.php:8
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:18
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:19
-msgid "Base Group Tree"
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
msgstr ""
-#: templates/settings.php:20
-msgid "Group-Member association"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
-msgid "Do not use it for SSL connections, it will fail."
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
new file mode 100644
index 0000000000..101ab76c34
--- /dev/null
+++ b/l10n/hy/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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/ia/core.po b/l10n/ia/core.po
index 42c8432317..42e7435110 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index e30ef22aa4..8fc773b81b 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 542eba1d2e..19dc97513c 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index e59e245c38..c5f0d75a41 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index b4104ed933..42d31cb4af 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 788abf2929..100d1a507a 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 7c02d48b46..0e666b6dc5 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index a1ee19817d..414afc80d5 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 2a9cb44575..1ff9a6a4ac 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Deler"
@@ -153,15 +153,15 @@ msgstr "Deler"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Contrasigno"
@@ -423,7 +423,7 @@ msgstr "Nove contrasigno"
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Crear"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Altere"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index df0015b677..f9c33cc351 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index 5b5b3f3347..a91b0b25c8 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 059487c899..f2de19bb1f 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 2b55a07afc..1c40126513 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 0bcbac2567..0266196aaf 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Enkripsi"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Enkripsi berkas aktif."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Tipe berkas berikut tidak akan dienkripsi:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Kecualikan tipe berkas berikut dari enkripsi:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Tidak ada"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 560eebccca..e8f9d9991e 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 153f33d41c..b6afa49959 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 01a06ac1fa..2d6c5c1bc6 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 24b9a2f18c..a22d263e44 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 1339358d4d..ba9d5f8ab3 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 4a0a14b40b..a59e270c34 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "urungkan"
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grup"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Hapus"
@@ -153,15 +153,15 @@ msgstr "Hapus"
msgid "add group"
msgstr "tambah grup"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Tuliskan nama pengguna yang valid"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Gagal membuat pengguna"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
@@ -399,7 +399,7 @@ msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
msgid "Show First Run Wizard again"
msgstr "Tampilkan Penuntun Konfigurasi Awal"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Sandi"
@@ -423,7 +423,7 @@ msgstr "Sandi baru"
msgid "Change password"
msgstr "Ubah sandi"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nama Tampilan"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nama Masuk"
@@ -463,30 +463,34 @@ msgstr "Nama Masuk"
msgid "Create"
msgstr "Buat"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Penyimpanan Baku"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Tak terbatas"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Lainnya"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Penyimpanan"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "ubah nama tampilan"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "setel sandi baru"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 362136515b..6cc8ef52c7 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 89a9bc5bcd..f4b9d4b50e 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Widya Walesa <walecha99@gmail.com>, 2013.
+# w41l <walecha99@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index e22a70549e..40621a8f14 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 869426fc92..d74a3b4bd4 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 5c70420bc3..db1c0d6ba6 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Dulkóðun"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ekkert"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 24ffcf24c1..52a88992db 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 04af1ac95b..352d5e80ee 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 8883af2d41..5392fa777b 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 0f8c3dd0c3..ad7f909d9f 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 6e7680443b..38d90ff0c9 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 5f4d199f3e..fb877debb8 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "afturkalla"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eyða"
@@ -153,15 +153,15 @@ msgstr "Eyða"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lykilorð"
@@ -423,7 +423,7 @@ msgstr "Nýtt lykilorð"
msgid "Change password"
msgstr "Breyta lykilorði"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þÃnu"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Búa til"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Sjálfgefin gagnageymsla"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ótakmarkað"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Annað"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "gagnapláss"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index da829f884d..a0b043fa98 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 66194d2dae..6daf7cdbf0 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <sveinng@gmail.com>, 2012.
+# sveinn <sveinng@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index dbaa6ad613..afb024ad7f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:50+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 212df78a49..33bc6bca21 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 7fa5301fd9..89b718b4e7 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.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-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:23+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Cifratura"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La cifratura dei file è abilitata."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "I seguenti tipi di file non saranno cifrati:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Escludi i seguenti tipi di file dalla cifratura:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nessuno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 69822dc443..8421dcb6da 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index f6a7ae0e9d..7ffbbe6cbc 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 24417db353..5122590d44 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 51be74320b..eecb2f8f5e 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 9d852114bd..960c17220c 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 23:50+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index ae610e485c..160cf8e116 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "annulla"
msgid "Unable to remove user"
msgstr "Impossibile rimuovere l'utente"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppi"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppi amministrati"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Elimina"
@@ -154,15 +154,15 @@ msgstr "Elimina"
msgid "add group"
msgstr "aggiungi gruppo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Deve essere fornito un nome utente valido"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Errore durante la creazione dell'utente"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
@@ -400,7 +400,7 @@ msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
msgid "Show First Run Wizard again"
msgstr "Mostra nuovamente la procedura di primo avvio"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Password"
@@ -424,7 +424,7 @@ msgstr "Nuova password"
msgid "Change password"
msgstr "Modifica password"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nome visualizzato"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome utente"
@@ -464,30 +464,34 @@ msgstr "Nome utente"
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Archiviazione predefinita"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Illimitata"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Altro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Archiviazione"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "cambia il nome visualizzato"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "imposta una nuova password"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 21ebc69f2a..93a262334a 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index 705336024c..342564faf7 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-20 02:01+0200\n"
-"PO-Revision-Date: 2013-05-19 09:22+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index beac431856..3a48be5f08 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -223,7 +223,7 @@ msgstr "ã‚ャンセル"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "ファイルピッカーã®ãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 9990444dd1..14404a2b63 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 90764dc0da..9f859bdcdc 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "æš—å·åŒ–"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ファイルã®æš—å·åŒ–ã¯æœ‰åŠ¹ã§ã™ã€‚"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—ã¯æš—å·åŒ–ã•ã‚Œã¾ã›ã‚“:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—ã‚’æš—å·åŒ–ã‹ã‚‰é™¤å¤–:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ãªã—"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index fc034819a2..b356a404ef 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index cf0e397f11..b8185a8c78 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index 669aa32490..5275c832c9 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 62a28eb62b..2b62bba4cc 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 6d06b310e7..f9f380b0fd 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 6444931858..84ce823a72 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "å…ƒã«æˆ»ã™"
msgid "Unable to remove user"
msgstr "ユーザを削除出æ¥ã¾ã›ã‚“"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "グループ"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "グループ管ç†è€…"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "削除"
@@ -154,15 +154,15 @@ msgstr "削除"
msgid "add group"
msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ã‚’è¿½åŠ "
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "有効ãªãƒ¦ãƒ¼ã‚¶åを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "ユーザ作æˆã‚¨ãƒ©ãƒ¼"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
@@ -400,7 +400,7 @@ msgstr "ファイルをåŒæœŸã™ã‚‹ãŸã‚ã®ã‚¢ãƒ—リをå–å¾—"
msgid "Show First Run Wizard again"
msgstr "åˆå›žã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’å†è¡¨ç¤ºã™ã‚‹"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "パスワード"
@@ -424,7 +424,7 @@ msgstr "æ–°ã—ã„パスワードを入力"
msgid "Change password"
msgstr "パスワードを変更"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "表示å"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ファイルマãƒãƒ¼ã‚¸ãƒ£ã§ownCloudã«æŽ¥ç¶šã™ã‚‹éš›ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "ãƒã‚°ã‚¤ãƒ³å"
@@ -464,30 +464,34 @@ msgstr "ãƒã‚°ã‚¤ãƒ³å"
msgid "Create"
msgstr "作æˆ"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "デフォルトストレージ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "無制é™"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "ãã®ä»–"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ストレージ"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "表示åを変更"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "æ–°ã—ã„パスワードをè¨å®š"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index db962e11ee..dab3083511 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index 2341b9f95c..9db2784888 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 3840fc7208..fc467e8e09 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index bbfe04671f..d7db600b41 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 06cfd02260..a1c8afe604 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ka/files_external.po b/l10n/ka/files_external.po
index a9eecf3b31..b0114117f5 100644
--- a/l10n/ka/files_external.po
+++ b/l10n/ka/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 3c158ffc46..6cc4821858 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index 934d68261e..f40050033f 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_versions.po b/l10n/ka/files_versions.po
index fe02221e10..c36ba25f09 100644
--- a/l10n/ka/files_versions.po
+++ b/l10n/ka/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 26890fc56d..9974f858cf 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr "შველáƒ"
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr "პერსáƒáƒœáƒ"
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლები"
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr "áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr "ZIP გáƒáƒ“მáƒáƒ¬áƒ”რრგáƒáƒ›áƒáƒ თულიáƒ"
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index d7da24759a..fe9f5ba85c 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 597ca22517..d171be00d7 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
index 5433bc595c..81c2565495 100644
--- a/l10n/ka/user_webdavauth.po
+++ b/l10n/ka/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index a6fa0a1283..64fc196b18 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index e94fb3a405..c9057aaded 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 6678dd7cc5..291706c0f4 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.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-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ენკრიპციáƒ"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ ენკრიპცირჩáƒáƒ თულიáƒ."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "შემდეგი ფáƒáƒ˜áƒšáƒ£áƒ ი ტიპების ენკრიპცირáƒáƒ მáƒáƒ®áƒ“ებáƒ:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "áƒáƒ›áƒáƒ˜áƒ¦áƒ” შემდეგი ფáƒáƒ˜áƒšáƒ˜áƒ¡ ტიპები ენკრიპციიდáƒáƒœ:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "áƒáƒ áƒ"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index e3d4eb60b8..8322a11954 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 2f4fa98163..09f606f010 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 023bdfaf78..4bcb5f61e3 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 87f15b8179..35af4eeea3 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 254f201809..86e1a23451 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 04a0d9d034..a2dfe9c2d9 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "დáƒáƒ‘რუნებáƒ"
msgid "Unable to remove user"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "ჯგუფები"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "ჯგუფის áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
@@ -154,15 +154,15 @@ msgstr "წáƒáƒ¨áƒšáƒ"
msgid "add group"
msgstr "ჯგუფის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "შეცდáƒáƒ›áƒ მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის შექმნისáƒáƒ¡"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული პáƒáƒ áƒáƒšáƒ˜"
@@ -400,7 +400,7 @@ msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ”ბის სინქრáƒ
msgid "Show First Run Wizard again"
msgstr "მáƒáƒ©áƒ•áƒ”ნე თáƒáƒ•áƒ˜áƒ“áƒáƒœ გáƒáƒ¨áƒ•áƒ”ბული ვიზáƒáƒ დი"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
@@ -424,7 +424,7 @@ msgstr "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜"
msgid "Change password"
msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "დისპლეის სáƒáƒ®áƒ”ლი"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე შემდეგი მისáƒáƒ›áƒáƒ თი ownCloud–თáƒáƒœ დáƒáƒ¡áƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ ებლáƒáƒ“ შენს ფáƒáƒ˜áƒšáƒ›áƒ”ნეჯერში"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
@@ -464,30 +464,34 @@ msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
msgid "Create"
msgstr "შექმნáƒ"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ სáƒáƒªáƒáƒ•áƒ˜"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ულიმიტáƒ"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "სხვáƒ"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "სáƒáƒªáƒáƒ•áƒ˜"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "შეცვáƒáƒšáƒ” დისფლეის სáƒáƒ®áƒ”ლი"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "დáƒáƒáƒ§áƒ”ნეთ áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ პáƒáƒ áƒáƒ›áƒ”ტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 7f6f2193d4..c025752907 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index a6662b7e11..275948740f 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
+# drlinux64 <romeo@energo-pro.ge>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index b412b63b1f..d5e7454d04 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 6dc2264411..d8ead40a60 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 602b35e3e8..ec2074a7a7 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index d73e3f29a7..61e30ed382 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index 17f0921f70..a2eded06e4 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 1886595cea..28bf4f67f9 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/files_versions.po b/l10n/kn/files_versions.po
index 33d7a4a3b2..c61eacfeba 100644
--- a/l10n/kn/files_versions.po
+++ b/l10n/kn/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 8bc47e9ad2..2e4f63e50e 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 034be72d0d..899150546d 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index f6390750e1..782e792ba8 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/user_webdavauth.po b/l10n/kn/user_webdavauth.po
index 1dde34b41e..771cd4f87e 100644
--- a/l10n/kn/user_webdavauth.po
+++ b/l10n/kn/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index cee727ba0a..1994193459 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 72a5537640..db4d64d7d5 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 432f5ed625..36a52c5cbe 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "암호화"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ì—†ìŒ"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index da5082097d..b34d6965bf 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 54062f51db..b81e97c4cb 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index ace3627e1b..af0fe1a970 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index b3241be267..ce0e200f0b 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index b97c280d47..84d6019ebb 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 2c93f03d41..8d07c23891 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "ë˜ëŒë¦¬ê¸°"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "그룹"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "그룹 관리ìž"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ì‚ì œ"
@@ -153,15 +153,15 @@ msgstr "ì‚ì œ"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr "ì•±ì„ ì´ìš©í•˜ì—¬ ë‹¹ì‹ ì˜ íŒŒì¼ì„ ë™ê¸°í™” í• ìˆ˜ 있습니다."
msgid "Show First Run Wizard again"
msgstr "첫 실행 마법사 다시 ë³´ì´ê¸°"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "암호"
@@ -423,7 +423,7 @@ msgstr "새 암호"
msgid "Change password"
msgstr "암호 변경"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "표시 ì´ë¦„"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "íŒŒì¼ ê´€ë¦¬ìžì—ì„œ ownCloudì— ì ‘ì†í•˜ë ¤ë©´ ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "ë¡œê·¸ì¸ ì´ë¦„"
@@ -463,30 +463,34 @@ msgstr "ë¡œê·¸ì¸ ì´ë¦„"
msgid "Create"
msgstr "만들기"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "기본 ì €ìž¥ì†Œ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ë¬´ì œí•œ"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "기타"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ì €ìž¥ì†Œ"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "표시 ì´ë¦„ 변경"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "새 암호 ì„¤ì •"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 73fcf08442..d2b97308ba 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 02c3920ceb..07e03e8838 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -3,15 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <aoiob4305@gmail.com>, 2013.
-# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012.
-# Park Shinjo <kde@peremen.name>, 2013.
+# aoiob4305 <aoiob4305@gmail.com>, 2013
+# aoiob4305 <aoiob4305@gmail.com>, 2013
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012
+# 남ìžì‚¬ëžŒ <cessnagi@gmail.com>, 2012
+# Shinjo Park <kde@peremen.name>, 2013
+# Shinjo Park <kde@peremen.name>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index df702490ca..413035b869 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index b7ff8f3d26..d23f1d864c 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index c961a1e23d..5af0949e5c 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "نهێنیکردن"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "هیچ"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index ff019f8366..39319cbb04 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 7c929822b6..2c2621c77f 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 348f5fc442..be4563630c 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index 0b3811c2a5..65c39e3343 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index a1f467cb56..6b5349bf84 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 20bae1d2d7..88e46580f1 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
@@ -153,15 +153,15 @@ msgstr ""
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -423,7 +423,7 @@ msgstr "وشەی نهێنی نوێ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 3d3bedc560..2c76951bed 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index e623bd161b..381e788ea4 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 463eb139e4..7ded0d5205 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index d52d6051d9..42bbb7db49 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 09f6598370..4bce576ce6 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index d4781c62a4..6926dd0cc8 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index c88a6bd12d..e071f795bd 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index cf346cfdc0..fa572f9d22 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 7745e418c1..8c2aad478e 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 03a90b8536..3ac5b1843d 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index df0dc32b9f..2b874094f5 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "réckgängeg man"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppen Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Läschen"
@@ -153,15 +153,15 @@ msgstr "Läschen"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passwuert"
@@ -423,7 +423,7 @@ msgstr "Neit Passwuert"
msgid "Change password"
msgstr "Passwuert änneren"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Erstellen"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Aner"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index acc80e3d59..c03e8c3552 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 093341b3d2..1bceab60db 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index d5b4a0e4df..2045ec04d5 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 8fe91c5cfd..1eebbacea9 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 0ee0533579..d58c738c69 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Å ifravimas"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nieko"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index ab55528f0b..a99fd6418e 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 55fa2bf159..0e5e166ecd 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index b5ac859e3e..44da9a6a0b 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 57d518462c..393a714fb5 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index cbc43ee811..eea8492bfc 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 45772fd1b8..4103ebe057 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "anuliuoti"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "GrupÄ—s"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "IÅ¡trinti"
@@ -153,15 +153,15 @@ msgstr "IÅ¡trinti"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Slaptažodis"
@@ -423,7 +423,7 @@ msgstr "Naujas slaptažodis"
msgid "Change password"
msgstr "Pakeisti slaptažodį"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Sukurti"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Kita"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 1e73b74a00..006804c9ed 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 9f842d8539..173f9167f2 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mindaugas <min2lizz@gmail.com>, 2013.
+# Min2liz <min2lizz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 27ef0cf51e..a681f3b100 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 64d7876673..6f6fa26e2b 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index cc34243949..e18c05ba14 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Šifrēšana"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Datņu šifrēšana ir aktivēta."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "SekojoÅ¡Äs datnes netiks Å¡ifrÄ“tas:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Sekojošos datņu tipus izslēgt no šifrēšanas:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nav"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index c833916c88..03718850f3 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index ff9a877f0d..dfc7467507 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index e376539f1d..b6619dcfcb 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 7b0e211dbf..440afe984a 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index e27de079e8..9fdb84580a 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index f8f6d620dc..e6076c2ef4 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "atsaukt"
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotÄju"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Dzēst"
@@ -153,15 +153,15 @@ msgstr "Dzēst"
msgid "add group"
msgstr "pievienot grupu"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "JÄnorÄda derÄ«gs lietotÄjvÄrds"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Kļūda, veidojot lietotÄju"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "JÄnorÄda derÄ«ga parole"
@@ -399,7 +399,7 @@ msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
msgid "Show First Run Wizard again"
msgstr "VÄ“lreiz rÄdÄ«t pirmÄs palaiÅ¡anas vedni"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parole"
@@ -423,7 +423,7 @@ msgstr "Jauna parole"
msgid "Change password"
msgstr "Mainīt paroli"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Redzamais vÄrds"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Izmanto Å¡o adresi, lai, izmantojot datņu pÄrvaldnieku, savienotos ar savu ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "IerakstÄ«Å¡anÄs vÄrds"
@@ -463,30 +463,34 @@ msgstr "IerakstÄ«Å¡anÄs vÄrds"
msgid "Create"
msgstr "Izveidot"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "NoklusÄ“juma krÄtuve"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Neierobežota"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Cits"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "KrÄtuve"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "mainÄ«t redzamo vÄrdu"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "iestatīt jaunu paroli"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 1165adf4e3..13372d4da4 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index d866091dc0..bc46877310 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 3bd008969b..d59d840a52 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index ec08eae8ff..02958a44b6 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 42d168af09..86a89dc8c5 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ðишто"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 129bb0f945..f2fb362c44 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index f79af9510d..988ee369f9 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 40ba1a5bec..3a4424dbbe 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index a25f7e9a24..0f47626449 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 602ebd67b8..bf04616b5b 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 658d0a099b..2e1f5bfe49 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "врати"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групи"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "ÐдминиÑтратор на група"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Избриши"
@@ -153,15 +153,15 @@ msgstr "Избриши"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Лозинка"
@@ -423,7 +423,7 @@ msgstr "Ðова лозинка"
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "КориÑтете ја оваа адреÑа да "
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Создај"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "ОÑтанато"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index a7c58a824e..db60851b09 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index f396468a5d..78f50a5abe 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Georgi Stanojevski <glisha@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index c7eaafc301..ba209641f8 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index dbc1e5041c..c7a4735cf3 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 15afa59d32..6bde24151b 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 032ecb7e41..e47d90c476 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index d9b6bb9972..1bd8517254 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 57049cc4cd..eea348554b 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 22e8fd7432..c76d0b2b73 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index db278328fb..34be508aac 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index dfb5957c75..eade3e3980 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Kumpulan"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Padam"
@@ -153,15 +153,15 @@ msgstr "Padam"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Kata laluan"
@@ -423,7 +423,7 @@ msgstr "Kata laluan baru"
msgid "Change password"
msgstr "Ubah kata laluan"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Buat"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Lain"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 9525ea29a9..094fc785d6 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index c2284a1360..acf08a184c 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 8babf35390..5ded37e594 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index d99bb1abe9..96e24035fc 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 0980592321..ce8102c037 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index d6fae81ea2..12ae346136 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index bc2fd5ec55..5b883066e1 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 9107081978..6c22f61318 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
index 57a0f93840..60f265294d 100644
--- a/l10n/my_MM/files_versions.po
+++ b/l10n/my_MM/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 58fc7a42e0..9f36f1a333 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 0a56eeb646..d80dc9bfb1 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "စကားá€á€¾á€€á€º"
@@ -423,7 +423,7 @@ msgstr "စကားá€á€¾á€€á€ºá€¡á€žá€…်"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index edf738755a..f5d26e3942 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
index bfba4e1cd6..51443b323f 100644
--- a/l10n/my_MM/user_webdavauth.po
+++ b/l10n/my_MM/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index e7dd2477aa..e52d7c445e 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index e107543d82..9f856e2f2c 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 7fca6d3980..c1e9969292 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil-kryptering er aktivert."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Følgende filtyper vil ikke bli kryptert:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder følgende filtyper fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 917f02c2bd..67bb014219 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 868b4fd6eb..c113ac9ba7 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 7f0b7fad5f..3153e434c6 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Hans Nesse <>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 2c4717260a..0d1e2a829c 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 08f2ae8e5f..406555f3f3 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 3debc0b668..defddd01c2 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Hans Nesse <>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "angre"
msgid "Unable to remove user"
msgstr "Kunne ikke slette bruker"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Slett"
@@ -154,15 +154,15 @@ msgstr "Slett"
msgid "add group"
msgstr "legg til gruppe"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Oppgi et gyldig brukernavn"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Feil ved oppretting av bruker"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Oppgi et gyldig passord"
@@ -400,7 +400,7 @@ msgstr "Få dine apps til å synkronisere dine filer"
msgid "Show First Run Wizard again"
msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passord"
@@ -424,7 +424,7 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endre passord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Visningsnavn"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Logginn navn"
@@ -464,30 +464,34 @@ msgstr "Logginn navn"
msgid "Create"
msgstr "Opprett"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standard lager"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ubegrenset"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Annet"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Lager"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "endre visningsnavn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "sett nytt passord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 49f8151a5f..d77902c25c 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 0bdc4ebc7b..6228186b67 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <espenbye@me.com>, 2012.
+# espenbye <espenbye@me.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index c5b6a57bbb..bbe6f7e5af 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index a20804fbfe..2a295626b1 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 4eb8d284c4..9572c5a369 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index 5b2e2ed597..7e7ed0e396 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 6905b432c8..978e72b2eb 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 3775730782..0eebd5d130 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/files_versions.po b/l10n/ne/files_versions.po
index 3f57c723bc..75141cb34f 100644
--- a/l10n/ne/files_versions.po
+++ b/l10n/ne/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index bf5c92bdbf..17b8279af6 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 20957a953f..e1e8ae4a62 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 8bc9905662..eca44e17a0 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/user_webdavauth.po b/l10n/ne/user_webdavauth.po
index 64e025a6be..d8b30a63e3 100644
--- a/l10n/ne/user_webdavauth.po
+++ b/l10n/ne/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 5f6f7e5413..c0e1e5b3a2 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 0c04c6ce0d..7b0422f385 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 548a5be15b..26b54b72d7 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Versleuteling"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Bestandsversleuteling geactiveerd."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "De volgende bestandstypen zullen niet worden versleuteld:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Sluit de volgende bestandstypen uit van versleuteling:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Geen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 643ebd1c4b..fa61feb513 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 924a6cedb2..d7b53f40fc 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 7ccc62dbeb..ee4343a7ab 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 4b1bafb81f..83735c7ef7 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 08b48b27de..a5ffe9bf68 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 84e5a9fa47..2cea7358ed 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "ongedaan maken"
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Verwijder"
@@ -154,15 +154,15 @@ msgstr "Verwijder"
msgid "add group"
msgstr "toevoegen groep"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Fout bij aanmaken gebruiker"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
@@ -400,7 +400,7 @@ msgstr "Download de apps om bestanden te synchen"
msgid "Show First Run Wizard again"
msgstr "Toon de Eerste start Wizard opnieuw"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Wachtwoord"
@@ -424,7 +424,7 @@ msgstr "Nieuw"
msgid "Change password"
msgstr "Wijzig wachtwoord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Weergavenaam"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Inlognaam"
@@ -464,30 +464,34 @@ msgstr "Inlognaam"
msgid "Create"
msgstr "Creëer"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Default opslag"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ongelimiteerd"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Anders"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Opslag"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "wijzig weergavenaam"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "Instellen nieuw wachtwoord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Default"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 5fae8e1644..5def276210 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 90490f9dd9..9cd0fb7d2e 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-# Richard Bos <radoeka@gmail.com>, 2012.
+# André Koot <meneer@tken.net>, 2012-2013
+# Richard Bos <radoeka@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 4cdd6e7d94..f3fc449d67 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 4fb7cfb26d..e508384dac 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 8e3b4ed5f7..7aced3d3d2 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 2cdb030bf8..71a854578f 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 1b09608a94..7733d865d7 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index fb0d4b784b..c1c2af9a53 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 925f545edd..4de20b0844 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-21 02:00+0200\n"
-"PO-Revision-Date: 2013-05-20 15:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index f36faa6225..a63a6bb231 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index ad438e4bd5..3730eba1ef 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -138,16 +138,16 @@ msgstr "angra"
msgid "Unable to remove user"
msgstr "Klarte ikkje fjerna brukaren"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppestyrar"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Slett"
@@ -155,15 +155,15 @@ msgstr "Slett"
msgid "add group"
msgstr "legg til gruppe"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Du må oppgje eit gyldig brukarnamn"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Feil ved oppretting av brukar"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Du må oppgje eit gyldig passord"
@@ -401,7 +401,7 @@ msgstr "FÃ¥ app-ar som kan synkronisera filene dine"
msgid "Show First Run Wizard again"
msgstr "Vis Oppstartvegvisaren igjen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Passord"
@@ -425,7 +425,7 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endra passord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Visingsnamn"
@@ -457,7 +457,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Innloggingsnamn"
@@ -465,30 +465,34 @@ msgstr "Innloggingsnamn"
msgid "Create"
msgstr "Lag"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Standardlagring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ubegrensa"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Anna"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "endra visingsnamn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "lag nytt passord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index fcc357a041..214b5151d1 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 1b5e93f18c..865055bbb1 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index e9d807e557..2d38312773 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 69839d306e..b37b98e77b 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 3fbf4c0e83..0ad7cd968e 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 62da99608e..d581045b36 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 5a45905848..355080977a 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 5258fea480..457ddae4ba 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index 0c94025552..d1964f5cfa 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 74a296f1ae..bed1fe3806 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 0c5eb4da19..e5799e25ea 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "defar"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grops"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grop Admin"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Escafa"
@@ -153,15 +153,15 @@ msgstr "Escafa"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Senhal"
@@ -423,7 +423,7 @@ msgstr "Senhal novèl"
msgid "Change password"
msgstr "Cambia lo senhal"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Crea"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Autres"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index b30db96613..c3e6148098 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 28e19ba92c..13f4be6160 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 2fb34b855d..9d403274a9 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -224,7 +224,7 @@ msgstr "Anuluj"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index ea95d73c5b..422cdc66d6 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 7fd0d19e5c..faa26a3998 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Szyfrowanie"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Szyfrowanie plików jest włączone"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Poniższe typy plików nie będą szyfrowane:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Wyłącz poniższe typy plików z szyfrowania:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nic"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index 964bffff5d..925bef414e 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index ada05ce04a..8baac1c876 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 3818146e22..20141b5ca9 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index f06438de5b..897cae06ad 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 9503eaaf77..bf51a156f1 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -123,7 +124,7 @@ msgstr "Należy wprowadzić istniejące konto użytkownika lub administratora."
#: setup.php:155
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nie można ustanowić połączenia z bazą Oracle"
#: setup.php:237
msgid "MySQL username and/or password not valid"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index dd5b124971..d0043002b6 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "cofnij"
msgid "Unable to remove user"
msgstr "Nie można usunąć użytkownika"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupy"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Usuń"
@@ -154,15 +154,15 @@ msgstr "Usuń"
msgid "add group"
msgstr "dodaj grupÄ™"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Należy podać prawidłową nazwę użytkownika"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Błąd podczas tworzenia użytkownika"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
@@ -400,7 +400,7 @@ msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
msgid "Show First Run Wizard again"
msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Hasło"
@@ -424,7 +424,7 @@ msgstr "Nowe hasło"
msgid "Change password"
msgstr "Zmień hasło"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Wyświetlana nazwa"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Login"
@@ -464,30 +464,34 @@ msgstr "Login"
msgid "Create"
msgstr "Utwórz"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Magazyn domyślny"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Bez limitu"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Inne"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Magazyn"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "zmień wyświetlaną nazwę"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ustaw nowe hasło"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 1bf45fe73e..60970a2135 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -19,7 +20,7 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Nie udało się wyczyścić mapowania."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
@@ -59,7 +60,7 @@ msgstr "Nie można dodać konfiguracji serwera"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "Mapoanie wyczyszczone"
#: js/settings.js:112
msgid "Success"
@@ -342,7 +343,7 @@ msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atry
#: templates/settings.php:101
msgid "Internal Username"
-msgstr ""
+msgstr "Wewnętrzna nazwa użytkownika"
#: templates/settings.php:102
msgid ""
@@ -362,11 +363,11 @@ msgstr ""
#: templates/settings.php:103
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
#: templates/settings.php:104
msgid "Override UUID detection"
-msgstr ""
+msgstr "ZastÄ…p wykrywanie UUID"
#: templates/settings.php:105
msgid ""
@@ -381,11 +382,11 @@ msgstr ""
#: templates/settings.php:106
msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atrybuty UUID:"
#: templates/settings.php:107
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Mapowanie użytkownika LDAP"
#: templates/settings.php:108
msgid ""
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 437dc1175d..0f5ded49b5 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
-# Marcin Małecki <gerber@tkdami.net>, 2012.
+# bbartlomiej <bbartlomiej@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012
+# Marcin Małecki <gerber@tkdami.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 2407cc50ed..8d297b83b2 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index b650901aca..bff30ed4d8 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
index 13ec81b2fa..477facd06b 100644
--- a/l10n/pl_PL/files_encryption.po
+++ b/l10n/pl_PL/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index aec6c07a33..be11b7a026 100644
--- a/l10n/pl_PL/files_external.po
+++ b/l10n/pl_PL/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-23 23:58+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_sharing.po b/l10n/pl_PL/files_sharing.po
index 6bd035fa98..c8bd08a2ea 100644
--- a/l10n/pl_PL/files_sharing.po
+++ b/l10n/pl_PL/files_sharing.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-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
index 7920003d18..e6ecf010e7 100644
--- a/l10n/pl_PL/files_trashbin.po
+++ b/l10n/pl_PL/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-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index f20407f561..d6ce265c2a 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 08ef2633ca..8f136d5521 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 7245910d41..7cc05ae1cf 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
@@ -153,15 +153,15 @@ msgstr ""
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 9d3f142fb4..242252ed0e 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ 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/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> 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
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 8056a470e9..2ac39a4621 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index e3e181fda0..4b451b5a43 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -223,7 +223,7 @@ msgstr "Cancelar"
#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Template selecionador Erro ao carregar arquivo"
#: js/oc-dialogs.js:161
msgid "Yes"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 3228aff3b8..3d8b33bb27 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 76932c4a27..aaf88b3f80 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Criptografia"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "A criptografia de arquivos está ativada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes tipos de arquivo não serão criptografados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir os seguintes tipos de arquivo da criptografia:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nada"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index ab7d6a869c..a792ac29b9 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 19b81cd23c..7eedb66963 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 4d9963fa4f..ec03bb5f74 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 133e452f03..8da66a76aa 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 91dd830a9b..68ce889af1 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:59+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 98faa1feb7..d7c412cf55 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "ImpossÃvel remover usuário"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Excluir"
@@ -154,15 +154,15 @@ msgstr "Excluir"
msgid "add group"
msgstr "adicionar grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Forneça um nome de usuário válido"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Erro ao criar usuário"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
@@ -400,7 +400,7 @@ msgstr "Faça com que os apps sincronize seus arquivos"
msgid "Show First Run Wizard again"
msgstr "Mostrar este Assistente de novo"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Senha"
@@ -424,7 +424,7 @@ msgstr "Nova senha"
msgid "Change password"
msgstr "Alterar senha"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nome de Exibição"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome de Login"
@@ -464,30 +464,34 @@ msgstr "Nome de Login"
msgid "Create"
msgstr "Criar"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "alterar nome de exibição"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "definir nova senha"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 943319be94..58d5046ce4 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index c68169faea..ef503e227b 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-# <thoriumbr@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013
+# thoriumbr <thoriumbr@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 900edfc55f..f542bd33cd 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 96feb9f119..4a4f2840d2 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index d8cfa5891f..c618d2ad5f 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Encriptação"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "A encriptação de ficheiros está ligada"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes ficheiros não serão encriptados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir da encriptação os seguintes tipos de ficheiro:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenhum"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 7795ea340d..810188abef 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 3b7ae09e73..ba5c23b6a1 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 1eb1cd9f59..8a5bc4df46 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 7cfc0d4b7f..07264486f6 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 0f08273d3d..d9abe16e6e 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 696961608e..739cdc7752 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Não foi possÃvel remover o utilizador"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Eliminar"
@@ -154,15 +154,15 @@ msgstr "Eliminar"
msgid "add group"
msgstr "Adicionar grupo"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Um nome de utilizador válido deve ser fornecido"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Erro a criar utilizador"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Uma password válida deve ser fornecida"
@@ -400,7 +400,7 @@ msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
msgid "Show First Run Wizard again"
msgstr "Mostrar novamente Wizard de Arranque Inicial"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Password"
@@ -424,7 +424,7 @@ msgstr "Nova palavra-chave"
msgid "Change password"
msgstr "Alterar palavra-chave"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Nome público"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Nome de utilizador"
@@ -464,30 +464,34 @@ msgstr "Nome de utilizador"
msgid "Create"
msgstr "Criar"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Outro"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "modificar nome exibido"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "definir nova palavra-passe"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 7186aa08f3..e22a9e8085 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index ba3adcee86..e7e520a00a 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <daniel@mouxy.net>, 2012-2013.
-# Helder Meneses <helder.meneses@gmail.com>, 2012.
+# Mouxy <daniel@mouxy.net>, 2012-2013
+# Helder Meneses <helder.meneses@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 63e649fe27..75c699cffb 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 21bd251d8f..ded190fc42 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 91a23afb23..55c40bdf76 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ÃŽncriptare"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Niciuna"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 5d9b879da2..5321d0919a 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 1e3ee609ff..3feeea158c 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0b656f9091..88d58700c4 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 4ae67ab2bc..07ce3897b2 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 23c2edaf60..4f3eabe62c 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 1cce576b45..025c891439 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "Anulează ultima acțiune"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Șterge"
@@ -153,15 +153,15 @@ msgstr "Șterge"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parolă"
@@ -423,7 +423,7 @@ msgstr "Noua parolă"
msgid "Change password"
msgstr "Schimbă parola"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Crează"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Stocare implicită"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Nelimitată"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Altele"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Stocare"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 95cdac3c71..eff75c4862 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 637e3bf026..7c28a3a2af 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dumitru Ursu <>, 2013.
-# <laur.cristescu@gmail.com>, 2012.
+# Dimon Pockemon <>, 2013
+# laurentiucristescu <laur.cristescu@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 18dbafd721..82c9486364 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: foool <andrglad@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 90c3788e71..76134c946a 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index a43bdd216c..b57c5b6fa7 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Шифрование"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Шифрование файла включено."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Следующие типы файлов не будут зашифрованы:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "ИÑключить Ñледующие типы файлов из шифрованных:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ðет новоÑтей"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 1ed13f40c5..d514f51a78 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 908097384e..aa42b19d98 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 63bebc7818..77e0b0331a 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 24bebd364f..78d3f7898b 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index fd33536fc2..228e23807e 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 79c16bb485..72822fbc9e 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "отмена"
msgid "Unable to remove user"
msgstr "Ðевозможно удалить пользователÑ"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Группы"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Группа ÐдминиÑтраторы"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Удалить"
@@ -154,15 +154,15 @@ msgstr "Удалить"
msgid "add group"
msgstr "добавить группу"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "ПредоÑтавте подходÑщее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "ПредоÑтавте подходÑщий пароль"
@@ -400,7 +400,7 @@ msgstr "Получить Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñинхронизации
msgid "Show First Run Wizard again"
msgstr "Показать помощник наÑтройки"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Пароль"
@@ -424,7 +424,7 @@ msgstr "Ðовый пароль"
msgid "Change password"
msgstr "Сменить пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Отображаемое имÑ"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ИÑпользуйте Ñтот URL Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ менеджера к Вашему хранилищу"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
@@ -464,30 +464,34 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
msgid "Create"
msgstr "Создать"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Хранилище по-умолчанию"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ðеограниченно"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Другое"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "изменить отображаемое имÑ"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "уÑтановить новый пароль"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "По-умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index ea122b169b..94f6b62a91 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index c402a17458..d6d190c1ea 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Denis <reg.transifex.net@demitel.ru>, 2013.
-# <sharov3@gmail.com>, 2012.
-# <skoptev@ukr.net>, 2012.
+# Denis <reg.transifex.net@demitel.ru>, 2013
+# adol <sharov3@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 22b8f03bc0..9549e1c7be 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:20+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 04189fc1a3..a60fb5b883 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index e9f3e4b203..1ef909b3f5 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -3,14 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2013.
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
-msgstr "Шифрование"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ðи один"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index 3efa280a09..6b81e43f06 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index c0973fddbc..94dbca97a5 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_RU/files_sharing.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index 7e4bcb47ed..c01ff4dfd6 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 8931ebb796..39fe47d2ed 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.po
@@ -3,14 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 31c091a0c9..143e9b5498 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:20+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 43c1d82fa7..8fe4ec687f 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Группы"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Удалить"
@@ -153,15 +153,15 @@ msgstr "Удалить"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Другое"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 9e4d98945d..febe3cdaea 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: 2013-04-26 08:02+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 8223c3dc9b..b2e9152457 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <cdewqazxsqwe@gmail.com>, 2013.
-# <cdewqazxsqwe@gmail.com>, 2012.
-# <skoptev@ukr.net>, 2012.
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
@@ -22,11 +22,11 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "WebDAV аутентификациÑ"
+msgstr ""
#: templates/settings.php:4
msgid "URL: http://"
-msgstr "URL: http://"
+msgstr ""
#: templates/settings.php:7
msgid ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index ebc75e66e2..f4623415ee 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 58fe5a8217..cbd18eba80 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 4f64e1d7f5..23b0eaf780 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ගුප්චකේà¶à¶±à¶º"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "කිසිවක් නà·à¶"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 3fc997bbe1..9c280da04a 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index ead4e52179..17e00511be 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index df590ba871..2aa02bca50 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index e25ea0e116..5106a985d4 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 41cc98f783..407a6a1ee9 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index eee6f40820..c787880b28 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "නිෂ්ප්â€à¶»à¶· කරන්න"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "කණ්ඩà·à¶ºà¶¸à·Š"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "කà·à¶«à·Šà¶© පරිපà·à¶½à¶š"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "මක෠දමන්න"
@@ -153,15 +153,15 @@ msgstr "මක෠දමන්න"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "මුර පදය"
@@ -423,7 +423,7 @@ msgstr "නව මුරපදය"
msgid "Change password"
msgstr "මුරපදය වෙනස් කිරීම"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "à¶à¶±à¶±à·Šà¶±"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "වෙනà¶à·Š"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 391d5cdf80..69ab01c359 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index cb5a2e879d..50163948c6 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
+# Anushke Guneratne <anushke@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 267759adec..fa7bfd1c9e 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 29c0e20276..98060efa36 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index e1bece6b03..d955fe70f3 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 6addb65af3..62d305b600 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 9348337814..489876c2ba 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index d363a222d4..101816d2a6 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
index 1a9009a2ae..e61ebf4f94 100644
--- a/l10n/sk/files_versions.po
+++ b/l10n/sk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 50d96efd77..d2b85b1a0f 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 1c2339b2dc..09d08c8666 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 7e555cc8df..2dd52e5593 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index 4a5a83a1ea..7eac54f7db 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 992dcda4c5..a5ad8b667d 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 4107af7595..f5b5bb4b99 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 3c5194e64c..7986558531 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Å ifrovanie"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifrovanie súborov nastavené."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Uvedené typy súborov nebudú šifrované:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Nešifrovať uvedené typy súborov"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Žiadny"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 2545d3dae8..6d51e1e990 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 986c44241a..e082720a9c 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index 3cb233da32..1765328e96 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index e7044592ad..2e4b2d8438 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 8f6db323d2..b4c5868fbd 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 2121c51ae9..2933b88074 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "vrátiť"
msgid "Unable to remove user"
msgstr "Nemožno odobraÅ¥ použÃvateľa"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Zmazať"
@@ -154,15 +154,15 @@ msgstr "Zmazať"
msgid "add group"
msgstr "pridať skupinu"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "MusÃte zadaÅ¥ platné použÃvateľské meno"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Chyba pri vytváranà použÃvateľa"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "MusÃte zadaÅ¥ platné heslo"
@@ -400,7 +400,7 @@ msgstr "ZÃskaÅ¥ aplikácie na synchronizáciu VaÅ¡ich súborov"
msgid "Show First Run Wizard again"
msgstr "Znovu zobraziÅ¥ sprievodcu prvým spustenÃm"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Heslo"
@@ -424,7 +424,7 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Zobrazované meno"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Prihlasovacie meno"
@@ -464,30 +464,34 @@ msgstr "Prihlasovacie meno"
msgid "Create"
msgstr "Vytvoriť"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Predvolené úložisko"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Nelimitované"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Iné"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Úložisko"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "zmeniť zobrazované meno"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "nastaviť nové heslo"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 3d3ff42198..1df70434af 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index e20d8617a6..b0cb3100e7 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-# <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
+# martin <zatroch.martin@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 1cc6c8be92..2218dd2444 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 98dbfaa2d2..27ed585646 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 716091a2f0..547f21c77e 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Å ifriranje"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Å ifriranje datotek je omogoÄeno."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Navedene vrste datotek ne bodo Å¡ifrirane:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ne Å¡ifriraj navedenih vrst datotek:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Brez"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index bfc8aef54d..73de395130 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: mateju <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 3a379322f4..ce360b38b2 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 4e473f9e0d..2737fb4833 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 72f744258c..3ca64dce8f 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index f00e1cfe9e..021c2f0651 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 7aac3a9c61..4f0ec81dfb 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "razveljavi"
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoÄe odstraniti"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Izbriši"
@@ -154,15 +154,15 @@ msgstr "Izbriši"
msgid "add group"
msgstr "dodaj skupino"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Navedeno mora biti veljavno uporabniško ime"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Napaka ustvarjanja uporabnika"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
@@ -400,7 +400,7 @@ msgstr "Pridobi programe za usklajevanje datotek"
msgid "Show First Run Wizard again"
msgstr "Zaženi Äarovnika prvega zagona"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Geslo"
@@ -424,7 +424,7 @@ msgstr "Novo geslo"
msgid "Change password"
msgstr "Spremeni geslo"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Prikazano ime"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud."
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Prijavno ime"
@@ -464,30 +464,34 @@ msgstr "Prijavno ime"
msgid "Create"
msgstr "Ustvari"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Privzeta shramba"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Neomejeno"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Shramba"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "spremeni prikazano ime"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "nastavi novo geslo"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 3ef07c58ce..a2bf110b8c 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index dc42b6b156..1d6f802d7e 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Matej UrbanÄiÄ <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 53b53efb25..f0dbeef076 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 3cc87f36be..c568a7ea9d 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index bccdde2ed2..9e60c9f781 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 40f6851fca..b37e931876 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 40e4950386..13bb44e5d8 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 0c02b9d17a..fe7013717f 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 4520df0880..3c148e4911 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index ec8afab2c5..7087246f85 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index f8450cb1d6..2a121b936a 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "anulo"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Elimino"
@@ -153,15 +153,15 @@ msgstr "Elimino"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj"
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Kodi"
@@ -423,7 +423,7 @@ msgstr "Kodi i ri"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 9e225efdf3..c998c3a755 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 9449bd231d..2ffc70b6f1 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index b1d533cb3e..41a68f296d 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index f9bd1de117..c0c200fe30 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 22a63dce30..87c2f4d32a 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Шифровање"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ðишта"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 5a4ff450a2..727dfea3dc 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index b129a71228..9ed2c5b704 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index fa2752d7b1..0c8f03dfa5 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 2c8b97da34..74cb70e53d 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 485582b642..ebc7f3d444 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 59a1cb704f..0ec3f4dd53 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "опозови"
msgid "Unable to remove user"
msgstr "Ðе могу да уклоним кориÑника"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групе"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Обриши"
@@ -153,15 +153,15 @@ msgstr "Обриши"
msgid "add group"
msgstr "додај групу"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Морате унети иÑправно кориÑничко име"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Грешка при прављењу кориÑника"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Морате унети иÑправну лозинку"
@@ -399,7 +399,7 @@ msgstr "Преузмите апликације ради Ñинхронизов
msgid "Show First Run Wizard again"
msgstr "Поново прикажи чаробњак за прво покретање"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Лозинка"
@@ -423,7 +423,7 @@ msgstr "Ðова лозинка"
msgid "Change password"
msgstr "Измени лозинку"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Име за приказ"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "КориÑтите ову адреÑу да Ñе повежете Ñа ownCloud-ом у управљачу датотекама"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "КориÑничко име"
@@ -463,30 +463,34 @@ msgstr "КориÑничко име"
msgid "Create"
msgstr "Ðаправи"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Подразумевано Ñкладиште"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ðеограничено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Друго"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Складиште"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "промени име за приказ"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "поÑтави нову лозинку"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index d743873a29..d03ebaa856 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index c72a84c03c..30b3f69adc 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <theranchcowboy@gmail.com>, 2013.
+# Rancher <theranchcowboy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 0fdd177341..d77f9e99bf 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 3b0df58b92..f8a78e2dc6 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 457c34823a..a74b20d15a 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index c5525d7bad..d57670789b 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 6b3b853248..b4e99a9555 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 48e196f8f1..f35ead6c73 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 2f888ae0aa..ccd4cfed29 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 8b50f9673b..8d5ce2c288 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 43034f3b49..e2014da2ff 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Obriši"
@@ -153,15 +153,15 @@ msgstr "Obriši"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lozinka"
@@ -423,7 +423,7 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmeni lozinku"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "Napravi"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index f3a97db15e..fa87c1da98 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 44c82fe664..8a2eb941c1 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 9363336483..55bbdb3181 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 77f7e3f849..de78bc0590 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 990e7bf176..2304b076cb 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Filkryptering är aktiverat."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Följande filtyper kommer inte att krypteras:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Exkludera följande filtyper från kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 8264e4d067..7187b42757 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 652c7f84c9..18c691e54c 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index a2f0d01a62..c709d6e6ed 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 7f6c0a26be..0448134617 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index a387fe4822..fcaee0db29 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index b2802dad5a..9ad1fa01f7 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "Ã¥ngra"
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Radera"
@@ -153,15 +153,15 @@ msgstr "Radera"
msgid "add group"
msgstr "lägg till grupp"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Ett giltigt användarnamn måste anges"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Fel vid skapande av användare"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
@@ -399,7 +399,7 @@ msgstr "Skaffa appar för att synkronisera dina filer"
msgid "Show First Run Wizard again"
msgstr "Visa Första uppstarts-guiden igen"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Lösenord"
@@ -423,7 +423,7 @@ msgstr "Nytt lösenord"
msgid "Change password"
msgstr "Ändra lösenord"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Visat namn"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Inloggningsnamn"
@@ -463,30 +463,34 @@ msgstr "Inloggningsnamn"
msgid "Create"
msgstr "Skapa"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Förvald lagring"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Obegränsad"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Annat"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "ändra visat namn"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ange nytt lösenord"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 466f22acaf..87214836c2 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index 0cb54a97da..ec341c5481 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Magnus Höglund <magnus@linux.com>, 2012-2013.
+# Magnus Höglund <magnus@linux.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 09988ffea2..ee5e620265 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -212,26 +212,30 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:121
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:161
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
+#: js/oc-dialogs.js:181
+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."
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index a8b0ef83d0..838ddc4ca6 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 84ed219358..a161ae8090 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 9a1b8f84a9..7958c592cf 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 327c56dc2f..486d565277 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index b865f9f8a6..d76092bcb4 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-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index 2a223ee7bb..93654e24af 100644
--- a/l10n/sw_KE/files_versions.po
+++ b/l10n/sw_KE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 88df9e82be..1b46612b1c 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:349
+#: app.php:357
msgid "Help"
msgstr ""
-#: app.php:362
+#: app.php:370
msgid "Personal"
msgstr ""
-#: app.php:373
+#: app.php:381
msgid "Settings"
msgstr ""
-#: app.php:385
+#: app.php:393
msgid "Users"
msgstr ""
-#: app.php:398
+#: app.php:406
msgid "Apps"
msgstr ""
-#: app.php:406
+#: app.php:414
msgid "Admin"
msgstr ""
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -113,72 +113,76 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:132 setup.php:325 setup.php:370
+#: setup.php:132 setup.php:329 setup.php:374
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:133 setup.php:156 setup.php:234
+#: setup.php:133 setup.php:238
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:155 setup.php:458 setup.php:525
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
msgstr ""
-#: setup.php:233
+#: setup.php:237
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:583 setup.php:592 setup.php:600 setup.php:609
-#: setup.php:615
+#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
+#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
+#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
+#: setup.php:623
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:288 setup.php:392 setup.php:401 setup.php:419 setup.php:429
-#: setup.php:438 setup.php:467 setup.php:533 setup.php:559 setup.php:566
-#: setup.php:577 setup.php:593 setup.php:601 setup.php:610
+#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
+#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
+#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:304
+#: setup.php:308
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:305
+#: setup.php:309
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:310
+#: setup.php:314
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:311
+#: setup.php:315
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:584 setup.php:616
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:636
+#: setup.php:644
#, php-format
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:867
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:859
+#: setup.php:868
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index e93dc47057..a8fd5f1a2c 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -120,52 +120,52 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:115
+#: js/personal.js:118
msgid "Saving..."
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr ""
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr ""
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr ""
-#: js/users.js:414
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:420
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
msgid "__language_name__"
msgstr ""
@@ -324,11 +324,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:235 templates/personal.php:100
+#: templates/admin.php:235 templates/personal.php:105
msgid "Version"
msgstr ""
-#: templates/admin.php:238 templates/personal.php:103
+#: templates/admin.php:237 templates/personal.php:108
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -443,19 +443,19 @@ msgstr ""
msgid "Language"
msgstr ""
-#: templates/personal.php:84
+#: templates/personal.php:89
msgid "Help translate"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:94
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:91
+#: templates/personal.php:96
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 61cca7831d..14bfbf0acb 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-17 02:03+0200\n"
-"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/user_webdavauth.po b/l10n/sw_KE/user_webdavauth.po
index 426f5e3072..b41a7fe5ab 100644
--- a/l10n/sw_KE/user_webdavauth.po
+++ b/l10n/sw_KE/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 695c92e17f..6bf0a9e637 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 544d15e92e..5d45574916 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index f8019b0d4a..251e10cda5 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index e5905a94a4..5c13f3d48d 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 4c9c4ab550..d2822a64b4 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index bb442763f3..64e6357655 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index 6125b2b2da..7fbbf568c9 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 84fbc746d8..b5723cd97b 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 22fbcef78d..784a4f7933 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "à®®à¯à®©à¯ செயல௠நீகà¯à®•à®®à¯ "
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "கà¯à®´à¯ நிரà¯à®µà®¾à®•à®¿"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "நீகà¯à®•à¯à®•"
@@ -153,15 +153,15 @@ msgstr "நீகà¯à®•à¯à®•"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
@@ -423,7 +423,7 @@ msgstr "பà¯à®¤à®¿à®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯"
msgid "Change password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மாறà¯à®±à¯à®•"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr "உரà¯à®µà®¾à®•à¯à®•à¯à®•"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "மறà¯à®±à®µà¯ˆ"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 2e07179f97..c08c0ad22f 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index e75db9cc3f..fa5d31237c 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <suganthi@nic.lk>, 2012.
+# suganthi <suganthi@nic.lk>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 514c0cb50a..1a1814b1a5 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 95fe99e2dd..4a8ff7c303 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index d80b40f452..ef53fa5d98 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 4b741282d9..f52067c27b 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 84ca97cc6a..96195fcf7a 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 726aa934a2..faffde55b4 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/files_versions.po b/l10n/te/files_versions.po
index 2a514b335c..b745dfb020 100644
--- a/l10n/te/files_versions.po
+++ b/l10n/te/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 4cc91ef1e9..f9c63628e5 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 0468471645..823a5c03b4 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "తొలగించà±"
@@ -153,15 +153,15 @@ msgstr "తొలగించà±"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "సంకేతపదం"
@@ -423,7 +423,7 @@ msgstr "కొతà±à°¤ సంకేతపదం"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 45077de378..5d5ca929e6 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index bfa7e06be6..dac5225d96 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f16aa6c446..7f32c63dc4 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 6b6a9e05aa..b4daa36b3a 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 199e2828b8..e1e2617a28 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,77 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index db915a6782..460c1c53c7 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 4b97bd4b71..66079f3e80 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 51720b0f3d..de204ee02f 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index eb2b51e4f7..f97c71f8aa 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index cdf00a0782..cdb616e1de 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index bbf68c3a5a..46a7425442 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
@@ -153,15 +153,15 @@ msgstr ""
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr ""
@@ -423,7 +423,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 51427e13fb..4c06e94d5a 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 4783300333..70a4f7ebe3 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-05-24 01:57+0200\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index d4d148f2c9..dfed5edab7 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 0ee6248b27..ca56cc9c74 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index f6529f0dc5..5c89237280 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "à¸à¸²à¸£à¹€à¸‚้ารหัส"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ไม่มี"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index d1679d21f4..7f78481e21 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 6e48c1ef81..322abcd87d 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 891b4da11c..11a4930831 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 2ed8da96a5..484c5c2cda 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 4dbdc8be1d..1131fe6de0 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 4d1ea92e63..3c7d74699d 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "เลิà¸à¸—ำ"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "à¸à¸¥à¸¸à¹ˆà¸¡"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "ผู้ดูà¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ลบ"
@@ -153,15 +153,15 @@ msgstr "ลบ"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr "à¹à¸ªà¸”งหน้าจà¸à¸§à¸´à¸‹à¸²à¸£à¹Œà¸”นำทางครั้งà¹à¸£à¸à¸à¸µà¸à¸„รั้ง"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "รหัสผ่าน"
@@ -423,7 +423,7 @@ msgstr "รหัสผ่านใหม่"
msgid "Change password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "ชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹à¸ªà¸”ง"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ใช้ที่à¸à¸¢à¸¹à¹ˆà¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸à¸±à¸š ownCloud ในโปรà¹à¸à¸£à¸¡à¸ˆà¸±à¸”à¸à¸²à¸£à¹„ฟล์ขà¸à¸‡à¸„ุณ"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ"
@@ -463,30 +463,34 @@ msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ร
msgid "Create"
msgstr "สร้าง"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "พื้นที่จำà¸à¸±à¸”ข้à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ไม่จำà¸à¸±à¸”จำนวน"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "à¸à¸·à¹ˆà¸™à¹†"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "เปลี่ยนชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹ƒà¸«à¹‰à¹à¸ªà¸”ง"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ตั้งค่ารหัสผ่านใหม่"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 57aa79e2fa..ed7bed1d8d 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 5c6623a310..af83ef0d00 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index d006494382..332dd0bd38 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 676603c65a..c8e788730a 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index e97475fd97..2034370f53 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Åžifreleme"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Dosya ÅŸifreleme aktif."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Belirtilen dosya tipleri ÅŸifrelenmeyecek:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Seçilen dosya tiplerini şifreleme:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Hiçbiri"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 089a46d9f6..90df3457fe 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 546d65d8d9..2cb763728c 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index f00cf7484c..c9a86cda20 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 191e24b1a3..9f1d643d13 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index df47baf932..580824cba7 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 8f5cf140aa..f681c072e0 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "geri al"
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Sil"
@@ -154,15 +154,15 @@ msgstr "Sil"
msgid "add group"
msgstr "grup ekle"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Kullanıcı oluşturulurken hata"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
@@ -400,7 +400,7 @@ msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
msgid "Show First Run Wizard again"
msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Parola"
@@ -424,7 +424,7 @@ msgstr "Yeni parola"
msgid "Change password"
msgstr "Parola deÄŸiÅŸtir"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Ekran Adı"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Giriş Adı"
@@ -464,30 +464,34 @@ msgstr "Giriş Adı"
msgid "Create"
msgstr "OluÅŸtur"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Varsayılan Depolama"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Limitsiz"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "DiÄŸer"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Depolama"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "ekran adını değiştir"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "yeni parola belirle"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index bfd9ca6593..9c166b28ef 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index a5b58c7648..03ee4902c8 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-23 01:58+0200\n"
-"PO-Revision-Date: 2013-04-22 20:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 0c10b9e073..5d03ea9787 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index f4bce231f7..d8d3444443 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index ce1f593333..ab0642eaf0 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.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-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:10+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "شىÙىرلاش"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ھۆججەت شىÙىرلاش قوزغىتىلدى."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "تۆۋەندىكى ھۆججەت تىپلىرى شىÙىرلانمايدۇ:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "تۆۋەندىكى ھۆججەت تىپلىرى شىÙÙ‰Ø±Ù„Ø§Ø´Ù†Ù‰Ú Ø³Ù‰Ø±ØªÙ‰Ø¯Ø§:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "يوق"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index 5c120aea0b..88f10e6962 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 99599acd88..067eda41c8 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: uqkun <uqkun@outlook.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 986d49ce3c..af9cf01335 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_versions.po b/l10n/ug/files_versions.po
index bc0751f8d0..6555776820 100644
--- a/l10n/ug/files_versions.po
+++ b/l10n/ug/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:40+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 0585574309..3cb94d1009 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 24ee51def4..a9b7ec7c9b 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,16 +136,16 @@ msgstr "ÙŠÛنىۋال"
msgid "Unable to remove user"
msgstr "ئىشلەتكۈچىنى چىقىرىۋÛتەلمەيدۇ"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "گۇرۇپپا"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "گۇرۇپپا باشقۇرغۇچى"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "ئۆچۈر"
@@ -153,15 +153,15 @@ msgstr "ئۆچۈر"
msgid "add group"
msgstr "گۇرۇپپا قوش"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "ئىم"
@@ -423,7 +423,7 @@ msgstr "ÙŠÛÚÙ‰ ئىم"
msgid "Change password"
msgstr "ئىم ئۆزگەرت"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "كۆرسىتىش ئىسمى"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "تىزىمغا كىرىش ئاتى"
@@ -463,30 +463,34 @@ msgstr "تىزىمغا كىرىش ئاتى"
msgid "Create"
msgstr "قۇر"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "ÙƒÛ†Úۈلدىكى ساقلىغۇچ"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "چەكسىز"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "باشقا"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "ساقلىغۇچ"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "ÙŠÛÚÙ‰ ئىم تەÚØ´Û•"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "ÙƒÛ†Úۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 79859271ff..f49de9b048 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index 30ac4d4ad7..544a8b946e 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:40+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 60c0ac8968..1db883d2b4 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 15bd0c1dfe..9c62403d52 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 2d3d805e58..e2f81845d5 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ 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"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "ШифруваннÑ"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Увімкнуто ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Такі типи файлів шифруватиÑÑŒ не будуть:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Виключити наÑтупні типи файлів з ​​шифруваннÑ:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Жоден"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 0a8a49f6f9..a01e520df4 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 7ac8549950..27552d234c 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index fa4cda467f..43cbc76e98 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 9cdb2fdef6..7fb44a00e8 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index e9b87cf8c6..8159cfccb7 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 3fb2467187..732f8e36ea 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "відмінити"
msgid "Unable to remove user"
msgstr "Ðеможливо видалити кориÑтувача"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Групи"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "ÐдмініÑтратор групи"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Видалити"
@@ -153,15 +153,15 @@ msgstr "Видалити"
msgid "add group"
msgstr "додати групу"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "Потрібно задати вірне ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "Помилка при Ñтворенні кориÑтувача"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
@@ -399,7 +399,7 @@ msgstr "Отримати додатки Ð´Ð»Ñ Ñинхронізації ваш
msgid "Show First Run Wizard again"
msgstr "Показувати МайÑтер Ðалаштувань знову"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Пароль"
@@ -423,7 +423,7 @@ msgstr "Ðовий пароль"
msgid "Change password"
msgstr "Змінити пароль"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Показати Ім'Ñ"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "ВикориÑтовуйте цю адреÑу Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ вашого ownCloud у вашому файловому менеджері"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ"
@@ -463,30 +463,34 @@ msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ"
msgid "Create"
msgstr "Створити"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Ñховище за замовчуваннÑм"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Ðеобмежено"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Інше"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Сховище"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "змінити зображене ім'Ñ"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "вÑтановити новий пароль"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "За замовчуваннÑм"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 98019dfaf4..cc23122583 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index 0b39465a48..feb00291cb 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <skoptev@ukr.net>, 2012.
-# <volodya327@gmail.com>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
+# skoptev <skoptev@ukr.net>, 2012
+# volodya327 <volodya327@gmail.com>, 2012
+# volodya327 <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index b9c4d4d054..a60769bb73 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 2cedc88260..c886690565 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 155fc654d0..ab35eed13c 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr ""
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index c1a5f1dda0..267556951c 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 3310ed7453..a094fe6a21 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index a767e6d265..0e100ced08 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index 3cd19f481f..87f26d3039 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index c783af97eb..681c34c81d 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 21:52+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index bc06878201..abeb1ee259 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr ""
@@ -153,15 +153,15 @@ msgstr ""
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "پاسورڈ"
@@ -423,7 +423,7 @@ msgstr "نیا پاسورڈ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 0f8cb26a3d..813f2b92f5 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index 874b058a64..3082e6561f 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index e5093a94fd..0a3b6e14af 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 2cca8bcaa0..da01e4c963 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 378186a7fc..fea18d335d 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "Mã hóa"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Mã hóa file đã mở"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Loại file sau sẽ không được mã hóa"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Việc mã hóa không bao gồm loại file sau"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "Không gì cả"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index c9777d959a..ea12a9f6ee 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 3421e01a4e..103ec6485a 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 3a638c39e2..6b4bea2008 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index f65e940269..ddb86932e1 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 9cf90a1574..1dbcbfd512 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 645bd7baf8..cfa7dc11ef 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "lùi lại"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "Xóa"
@@ -153,15 +153,15 @@ msgstr "Xóa"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr "Nháºn ứng dụng để đồng bá»™ file của bạn"
msgid "Show First Run Wizard again"
msgstr "Hiện lại việc chạy đồ thuáºt khởi đầu"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "Máºt khẩu"
@@ -423,7 +423,7 @@ msgstr "Máºt khẩu má»›i"
msgid "Change password"
msgstr "Äổi máºt khẩu"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "Tên hiển thị"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "SỠdụng địa chỉ nà y để kết nối ownCloud của bạn trong trình quản lý file của bạn"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "Tên đăng nháºp"
@@ -463,30 +463,34 @@ msgstr "Tên đăng nháºp"
msgid "Create"
msgstr "Tạo"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "Bộ nhớ mặc định"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "Không giới hạn"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "Khác"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "Bá»™ nhá»›"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "Thay đổi tên hiển thị"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "đặt máºt khẩu má»›i"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 2a8995440e..bd352de505 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 9f0e00a50a..e3cb6494d1 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
+# saosangm <saosangmo@yahoo.com>, 2013
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 0388186c3c..c72e1d1217 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 87d234de37..a678bd83fd 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 172dbb740f..1ef2cfcb7f 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "åŠ å¯†"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "æ— "
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index f65232c72a..b902f19431 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 2b091b8d3e..d1d72a03e5 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index fb84ff6561..650d11b4c5 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 036989e088..c1ffcfb75c 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 65e690b4fe..475ec6317b 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 61d98359d0..b1d21c46d3 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "群组"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "群组管ç†å‘˜"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "åˆ é™¤"
@@ -153,15 +153,15 @@ msgstr "åˆ é™¤"
msgid "add group"
msgstr "æ·»åŠ ç¾¤ç»„"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "请填写有效用户å"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "新增用户时出现错误"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "请填写有效密ç "
@@ -399,7 +399,7 @@ msgstr "获å–应用并åŒæ¥æ‚¨çš„文件"
msgid "Show First Run Wizard again"
msgstr "å†æ¬¡æ˜¾ç¤ºé¦–次è¿è¡Œå‘导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密ç "
@@ -423,7 +423,7 @@ msgstr "新密ç "
msgid "Change password"
msgstr "改å˜å¯†ç "
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "显示å称"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "使用æ¤åœ°å€æ¥åœ¨æ‚¨çš„文件管ç†å™¨ä¸è¿žæŽ¥æ‚¨çš„ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登录å"
@@ -463,30 +463,34 @@ msgstr "登录å"
msgid "Create"
msgstr "新建"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "默认容é‡"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "æ— é™åˆ¶"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其他"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "容é‡"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "更改显示å称"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "设置新的密ç "
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 80b5a7195f..6822f2a096 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 672fbad82e..60e0c7b044 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 73520d3ac5..0be2e9fed4 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 00903854a0..9d17fe97ca 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 9ececa5149..a1441c26e0 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "åŠ å¯†"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "æ–‡ä»¶åŠ å¯†å·²å¯ç”¨."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "如下的文件类型将ä¸ä¼šè¢«åŠ 密:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "ä»ŽåŠ å¯†ä¸æŽ’除如下的文件类型:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "æ— "
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 6e798b3bc3..c61ffd4438 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 77a25d1939..59049f512d 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 52c54bcbee..cfe8509cf7 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index a01c8b41aa..cc566f1c46 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index bad9755133..7a1e0aedf6 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 6056eafbef..4f7b161acd 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "组"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "组管ç†å‘˜"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "åˆ é™¤"
@@ -154,15 +154,15 @@ msgstr "åˆ é™¤"
msgid "add group"
msgstr "æ·»åŠ ç»„"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "å¿…é¡»æä¾›åˆæ³•çš„用户å"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "创建用户出错"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "å¿…é¡»æä¾›åˆæ³•çš„密ç "
@@ -400,7 +400,7 @@ msgstr "安装应用进行文件åŒæ¥"
msgid "Show First Run Wizard again"
msgstr "å†æ¬¡æ˜¾ç¤ºé¦–次è¿è¡Œå‘导"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密ç "
@@ -424,7 +424,7 @@ msgstr "新密ç "
msgid "Change password"
msgstr "修改密ç "
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "显示å称"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "用该地å€æ¥è¿žæŽ¥æ–‡ä»¶ç®¡ç†å™¨ä¸çš„ ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登录å称"
@@ -464,30 +464,34 @@ msgstr "登录å称"
msgid "Create"
msgstr "创建"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "默认å˜å‚¨"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "æ— é™"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其它"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "å˜å‚¨"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "修改显示å称"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "设置新密ç "
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index d4dd9b9928..5087046767 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 7c8b3ea542..82c49c2fbc 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
-# <wengxt@gmail.com>, 2013.
+# hanfeng <appweb.cn@gmail.com>, 2012
+# Dianjin Wang <1132321739qq@gmail.com>, 2012
+# marguerite su <i@marguerite.su>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 62dcdad63a..fcda9e3830 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index beaef109c9..470235c8ce 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 2cc250c386..2e428e4d49 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "åŠ å¯†"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "æª”æ¡ˆåŠ å¯†å·²é–‹å•Ÿ"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "以下文件類別將ä¸æœƒè¢«åŠ 密"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "空"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 3d43486723..e2c108e1e4 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 0e52725e03..f0d8ba37ac 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 0ad3c39ccd..64af91a243 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index a26316004a..dd78492845 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 412d69a73d..1ba7e60a91 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 9957cf25e6..ff300e8c64 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "群組"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "刪除"
@@ -153,15 +153,15 @@ msgstr "刪除"
msgid "add group"
msgstr ""
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr ""
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密碼"
@@ -423,7 +423,7 @@ msgstr "新密碼"
msgid "Change password"
msgstr ""
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr ""
@@ -463,30 +463,34 @@ msgstr ""
msgid "Create"
msgstr ""
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr ""
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr ""
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr ""
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr ""
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr ""
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr ""
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 8950dc88a4..211f3bf416 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 861fd6ab98..944ff2142a 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 75282bcc70..5c94351de7 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 6e4b9226e9..5042bd4bd1 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index c9a6bba11a..b897dc975b 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -17,22 +17,77 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:40
+msgid "Recovery key successfully "
+msgstr ""
+
+#: ajax/adminrecovery.php:42
+msgid "Could not "
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
msgstr "åŠ å¯†"
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "æª”æ¡ˆåŠ å¯†å·²è¢«å•Ÿç”¨"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
#: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "以下的文件類型ä¸æœƒè¢«åŠ 密："
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "å¾žåŠ å¯†ä¸æŽ’除的檔案類型："
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
-#: templates/settings.php:12
-msgid "None"
-msgstr "ç„¡"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 4d01dbe44f..d7d095a2b2 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 8da3c5805c..9d542c9d80 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:25+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index e98bbee141..55262a66e9 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-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index ceb0cbe053..dbe4ec462d 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 07:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index f4ee7ce21d..dab8cf41e5 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index cad92c61bf..ed343a6f38 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -137,16 +137,16 @@ msgstr "復原"
msgid "Unable to remove user"
msgstr "無法刪除用戶"
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
msgid "Groups"
msgstr "群組"
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
msgid "Group Admin"
msgstr "群組 管ç†å“¡"
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
msgid "Delete"
msgstr "刪除"
@@ -154,15 +154,15 @@ msgstr "刪除"
msgid "add group"
msgstr "新增群組"
-#: js/users.js:420
+#: js/users.js:428
msgid "A valid username must be provided"
msgstr "一定è¦æ供一個有效的用戶å"
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
msgid "Error creating user"
msgstr "創建用戶時出ç¾éŒ¯èª¤"
-#: js/users.js:426
+#: js/users.js:434
msgid "A valid password must be provided"
msgstr "一定è¦æ供一個有效的密碼"
@@ -400,7 +400,7 @@ msgstr "下載應用程å¼ä¾†åŒæ¥æ‚¨çš„檔案"
msgid "Show First Run Wizard again"
msgstr "å†æ¬¡é¡¯ç¤ºé¦–次使用精éˆ"
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
msgid "Password"
msgstr "密碼"
@@ -424,7 +424,7 @@ msgstr "新密碼"
msgid "Change password"
msgstr "變更密碼"
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
msgid "Display Name"
msgstr "顯示å稱"
@@ -456,7 +456,7 @@ msgstr "WebDAV"
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "在您的檔案管ç†å“¡ä¸ä½¿ç”¨é€™å€‹åœ°å€ä¾†é€£ç·šåˆ° ownCloud"
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
msgid "Login Name"
msgstr "登入å稱"
@@ -464,30 +464,34 @@ msgstr "登入å稱"
msgid "Create"
msgstr "建立"
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
msgid "Default Storage"
msgstr "é è¨å„²å˜å€"
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
msgid "Unlimited"
msgstr "ç„¡é™åˆ¶"
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
msgid "Other"
msgstr "其他"
-#: templates/users.php:82
+#: templates/users.php:87
msgid "Storage"
msgstr "儲å˜å€"
-#: templates/users.php:93
+#: templates/users.php:98
msgid "change display name"
msgstr "修改顯示å稱"
-#: templates/users.php:97
+#: templates/users.php:102
msgid "set new password"
msgstr "è¨å®šæ–°å¯†ç¢¼"
-#: templates/users.php:128
+#: templates/users.php:133
msgid "Default"
msgstr "é è¨"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index b6739a2934..30c56abebd 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:16+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 23:26+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 4dd48e2ce3..bfb582efc9 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 07:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index fa95089a61..3b32036d3a 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -24,6 +24,7 @@
"%s set the database host." => "%s ingresar el host de la base de datos.",
"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
+"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
"DB Error: \"%s\"" => "Error BD: \"%s\"",
"Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 2e25f1aa71..24fc98bde6 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -24,6 +24,7 @@
"%s set the database host." => "%s määra andmebaasi server.",
"PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
"You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
+"Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
"MySQL username and/or password not valid" => "MySQL kasutajatunnus ja/või parool pole õiged",
"DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
"Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 96b083821d..1b4db4b30a 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -24,6 +24,7 @@
"%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 de PostgreSQL incorrecto",
"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
+"Oracle connection could not be established" => "Non foi posÃbel estabelecer a conexión con Oracle",
"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index de15964b13..53a9290785 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -24,6 +24,7 @@
"%s set the database host." => "%s ustaw hosta bazy danych.",
"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
"You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub administratora.",
+"Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
"MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
"DB Error: \"%s\"" => "BÅ‚Ä…d DB: \"%s\"",
"Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
--
GitLab